From ed8144bfd71fae98e7d832a37e3eb49cca79abeb Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 12 Mar 2019 16:04:49 +0100
Subject: [PATCH] translate object type
---
.../possibleItemsProcess.js | 6 +++++-
.../_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 13 +++++++++----
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 5 ++++-
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 7 +++++--
.../basic/2019.2/add_ObjectRelation_type.xml | 2 +-
.../data_alias/basic/2019.2/changelog.xml | 2 +-
.../AditoBasic/ObjectRelation_exampleData.xml} | 0
7 files changed, 25 insertions(+), 10 deletions(-)
rename others/db_changes/data_alias/basic/2019.2/{ObjectRelation_add_type_exampleData.xml => data/AditoBasic/ObjectRelation_exampleData.xml} (100%)
diff --git a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js b/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js
index 320b109380..6a50b40e6e 100644
--- a/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/selectedobjectrelationtypeidproxy/possibleItemsProcess.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.db");
import("system.result");
import("system.vars");
@@ -10,4 +11,7 @@ result.object(db.table(
, [
[vars.get("$param.ObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
[vars.get("$param.ObjectType_param"), db.getColumnTypes("AB_OBJECTRELATIONTYPE", ["OBJECT_TYPE"])[0]],
-]]));
\ No newline at end of file
+]]).map(function(pItem)
+{
+ return [pItem[0], translate.text(pItem[1])];
+}));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 84ba642f70..313e1665a1 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2491,7 +2491,7 @@
<key>member</key>
</entry>
<entry>
- <key>promotion target by</key>
+ <key>promotion target of</key>
</entry>
<entry>
<key>supports</key>
@@ -2550,6 +2550,12 @@
<entry>
<key>Filetype</key>
</entry>
+ <entry>
+ <key>Special price list</key>
+ </entry>
+ <entry>
+ <key>New attribute</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
@@ -2562,9 +2568,8 @@ union
select AB_LANGUAGE.NAME_LATIN from AB_LANGUAGE
union
select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO
-union -- Object1Title and Object2Title for Keyword-Container ObjectRelationType
-select CHAR_VALUE from AB_KEYWORD_ATTRIBUTERELATION
-where AB_KEYWORD_ATTRIBUTE_ID in (&apos;6f81d079-d404-4bda-a7c7-b830ed3d80d5&apos;, &apos;e8c85be3-1acb-45f6-aeea-726ba5811ab8&apos;)</element>
+union
+select AB_OBJECTRELATIONTYPE.RELATION_TITLE from AB_OBJECTRELATIONTYPE</element>
</statements>
</languageSql>
</sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 66a7a69018..14a6b81e85 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2956,7 +2956,7 @@
<value>Mitglied</value>
</entry>
<entry>
- <key>promotion target by</key>
+ <key>promotion target of</key>
<value>Werbezielgruppe von</value>
</entry>
<entry>
@@ -2994,6 +2994,9 @@
<entry>
<key>Parent Attribute</key>
</entry>
+ <entry>
+ <key>Special price list1</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index c572b4d55a..3d9d3a9991 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2516,7 +2516,7 @@
<key>member</key>
</entry>
<entry>
- <key>promotion target by</key>
+ <key>promotion target of</key>
</entry>
<entry>
<key>supports</key>
@@ -2578,7 +2578,10 @@
<key>Filetype</key>
</entry>
<entry>
- <key>Entrydate (Month)</key>
+ <key>Special price list</key>
+ </entry>
+ <entry>
+ <key>New attribute</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml b/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml
index a731436b5a..7f09c1e549 100644
--- a/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml
+++ b/others/db_changes/data_alias/basic/2019.2/add_ObjectRelation_type.xml
@@ -95,7 +95,7 @@
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
<column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="promotion target by"/>
+ <column name="RELATION_TITLE" value="promotion target of"/>
<column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
<column name="SORT" valueNumeric="1"/>
</insert>
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 58aa672f62..90370e1732 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -88,5 +88,5 @@
<include relativeToChangelogFile="true" file="update_pricelist_keyword.xml"/>
<include relativeToChangelogFile="true" file="add_ObjectRelation_type.xml"/>
- <include relativeToChangelogFile="true" file="ObjectRelation_add_type_exampleData.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/AditoBasic/ObjectRelation_exampleData.xml" context="example"/>
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/ObjectRelation_add_type_exampleData.xml b/others/db_changes/data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
similarity index 100%
rename from others/db_changes/data_alias/basic/2019.2/ObjectRelation_add_type_exampleData.xml
rename to others/db_changes/data_alias/basic/2019.2/data/AditoBasic/ObjectRelation_exampleData.xml
--
GitLab