diff --git a/others/db_changes/data/1535552056314_relationLangChanges.xml b/others/db_changes/data/1535552056314_relationLangChanges.xml new file mode 100644 index 0000000000000000000000000000000000000000..f5dea025cf1fb2d48b86d1a38297e4b2b962c00e --- /dev/null +++ b/others/db_changes/data/1535552056314_relationLangChanges.xml @@ -0,0 +1,37 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <changeSet author="j.goderbauer" id="a87ef07d-1443-4de0-b553-02f564b28f20"> + <update tableName="RELATION"> + <column name="LANGUAGE" value="en-GB"></column> + <where>LANGUAGE = ?</where> + <whereParams> + <param value="en_GB"/> + </whereParams> + </update> + <update tableName="RELATION"> + <column name="LANGUAGE" value="no-NO"></column> + <where>LANGUAGE = ?</where> + <whereParams> + <param value="no_NO"/> + </whereParams> + </update> + <rollback> + <update tableName="RELATION"> + <column name="LANGUAGE" value="en_GB"></column> + <where>LANGUAGE = ?</where> + <whereParams> + <param value="en-GB"/> + </whereParams> + </update> + <update tableName="RELATION"> + <column name="LANGUAGE" value="no_NO"></column> + <where>LANGUAGE = ?</where> + <whereParams> + <param value="no-NO"/> + </whereParams> + </update> + </rollback> + </changeSet> +</databaseChangeLog> diff --git a/others/db_changes/data/example_history/example_history.xml b/others/db_changes/data/example_history/example_history.xml index 1f132fb3327934c84eb51752273644772db77c66..a6784ae72031ca4a1b6dd30f3abb4854f6eb20e8 100644 --- a/others/db_changes/data/example_history/example_history.xml +++ b/others/db_changes/data/example_history/example_history.xml @@ -23,13 +23,13 @@ <delete tableName="HISTORYLINK"> <where>HISTORYLINKID = ?</where> <whereParams> - <param value="de410a35-bcab-407e-9d60-7a65f028159b" /> + <param value="b435a1da-39f2-48ae-93a5-bad704e5ae48" /> </whereParams> </delete> <delete tableName="HISTORY"> <where>HISTORYID = ?</where> <whereParams> - <param value="b435a1da-39f2-48ae-93a5-bad704e5ae48" /> + <param value="de410a35-bcab-407e-9d60-7a65f028159b" /> </whereParams> </delete> </rollback> diff --git a/others/db_changes/data/example_history/extendHLink_62330df6.xml b/others/db_changes/data/example_history/extendHLink_62330df6.xml index 7e62525b79b2385f8c74a6a65062662b22844cb2..fc451b436fce925345f39157677fd49314e04a16 100644 --- a/others/db_changes/data/example_history/extendHLink_62330df6.xml +++ b/others/db_changes/data/example_history/extendHLink_62330df6.xml @@ -22,13 +22,13 @@ <delete tableName="HISTORYLINK"> <where>HISTORYLINKID = ?</where> <whereParams> - <param value="1050d93f-535a-4d01-a835-3ff0272c6af0" /> + <param value="850139a8-93b9-452c-8e02-e32b7c00e265" /> </whereParams> </delete> <delete tableName="HISTORY"> <where>HISTORYID = ?</where> <whereParams> - <param value="850139a8-93b9-452c-8e02-e32b7c00e265" /> + <param value="1050d93f-535a-4d01-a835-3ff0272c6af0" /> </whereParams> </delete> </rollback> diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml index ce276eeb3f2635f0de98e5721a74388a2ef54d02..995362246f63860b774b1bb14242fbb132c05ae4 100644 --- a/others/db_changes/masterChangelog.xml +++ b/others/db_changes/masterChangelog.xml @@ -13,4 +13,6 @@ <include file="data/example_history/extendHLink_62330df6.xml"/> <include file="struct/create_address.xml"/> <include file="struct/create_comm.xml"/> + <include file="misc/1535533490181_persChanges.xml"/> + <include file="data/1535552056314_relationLangChanges.xml"/> </databaseChangeLog> diff --git a/others/db_changes/misc/1535533490181_persChanges.xml b/others/db_changes/misc/1535533490181_persChanges.xml new file mode 100644 index 0000000000000000000000000000000000000000..e782af8a4e3e5eb47f92e12e92f3065483c3f6d5 --- /dev/null +++ b/others/db_changes/misc/1535533490181_persChanges.xml @@ -0,0 +1,37 @@ +<?xml version="1.1" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" + xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd"> + <changeSet author="j.goderbauer" id="e4b9e747-d734-441b-9bbd-ee3794c50636"> + <addColumn tableName="PERS"> + <column name="GENDER_e4b9e747" type="CHAR(1)"/> + </addColumn> + <update tableName="PERS"> + <column name="GENDER_e4b9e747" value="m" /> + <where>GENDER = ?</where> + <whereParams> + <param value="männlich"/> + </whereParams> + </update> + <dropColumn tableName="PERS"> + <column name="GENDER" /> + </dropColumn> + <renameColumn tableName="PERS" oldColumnName="GENDER_e4b9e747" newColumnName="GENDER" columnDataType="CHAR(1)" /> + <rollback> + <addColumn tableName="PERS"> + <column name="GENDER_e4b9e747" type="VARCHAR(50)"/> + </addColumn> + <update tableName="PERS"> + <column name="GENDER_e4b9e747" value="männlich" /> + <where>GENDER = ?</where> + <whereParams> + <param value="m"/> + </whereParams> + </update> + <dropColumn tableName="PERS"> + <column name="GENDER" /> + </dropColumn> + <renameColumn tableName="PERS" oldColumnName="GENDER_e4b9e747" newColumnName="GENDER" columnDataType="VARCHAR(50)" /> + </rollback> + </changeSet> +</databaseChangeLog> diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js index e65c8d64e2c85aefaa5b469d00d54494ed515cfa..f5a0424067e1753b467561f445bf868aa656080c 100644 --- a/process/Keyword_lib/process.js +++ b/process/Keyword_lib/process.js @@ -41,7 +41,7 @@ function KeywordUtils(){ ,createKeywordEntry("de-DE", translate.text("German (Germany)")) ,createKeywordEntry("de-AT", translate.text("German (Austria)")) ,createKeywordEntry("en", translate.text("English")) - ,createKeywordEntry("en-UK", translate.text("English (United Kingdom)")) + ,createKeywordEntry("en-GB", translate.text("English (United Kingdom)")) ,createKeywordEntry("no-NO", translate.text("Norwegian")) ]); break;