From 8370ba1afe1e54449c3261028452de0766468dd4 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 4 Mar 2019 14:09:33 +0100
Subject: [PATCH] =?UTF-8?q?=C3=9Cbersetzungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ObjectRelation_entity.aod | 4 +-
.../relation_type/displayValueProcess.js | 3 +-
.../_____LANGUAGE_EXTRA.aod | 104 ++++++++++++++-
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 126 ++++++++++++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 99 ++++++++++++++
.../2019.2/add_ObjectRelationKeyword.xml | 6 +-
6 files changed, 335 insertions(+), 7 deletions(-)
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 8c87e6e7476..4ea612737b1 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -85,13 +85,13 @@
</entityConsumer>
<entityField>
<name>OtherObjectRowid</name>
- <title>Other Rowid</title>
+ <title>Object</title>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OtherObjectType</name>
- <title>Other Type</title>
+ <title>Object type</title>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjecttype/displayValueProcess.js</displayValueProcess>
diff --git a/entity/ObjectRelation_entity/entityfields/relation_type/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/relation_type/displayValueProcess.js
index 5e306501b82..087347e37cc 100644
--- a/entity/ObjectRelation_entity/entityfields/relation_type/displayValueProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/relation_type/displayValueProcess.js
@@ -1,6 +1,7 @@
import("system.db");
import("system.result");
import("system.vars");
+import("system.translate");
import("Context_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
@@ -24,5 +25,5 @@ if (vars.exists("$field.OtherObjectType") && vars.get("$field.OtherObjectType")
name = attributes.Object1Title;
break;
}
- result.string(name);
+ result.string(translate.text(name));
}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index de78d4aa05f..bc6513be021 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2403,6 +2403,105 @@
<entry>
<key>Tree</key>
</entry>
+ <entry>
+ <key>100%</key>
+ </entry>
+ <entry>
+ <key>grandparents of - ankle of</key>
+ </entry>
+ <entry>
+ <key>Mobil</key>
+ </entry>
+ <entry>
+ <key>society - member</key>
+ </entry>
+ <entry>
+ <key>25%</key>
+ </entry>
+ <entry>
+ <key>supporter - supported</key>
+ </entry>
+ <entry>
+ <key>parent of - child of</key>
+ </entry>
+ <entry>
+ <key>50%</key>
+ </entry>
+ <entry>
+ <key>75%</key>
+ </entry>
+ <entry>
+ <key>Verknüpfungen</key>
+ </entry>
+ <entry>
+ <key>no keyword attribute \&quot;%0\&quot; found in keyword container \&quot;%1\&quot;</key>
+ </entry>
+ <entry>
+ <key>competitor</key>
+ </entry>
+ <entry>
+ <key>0%</key>
+ </entry>
+ <entry>
+ <key>parent company - subsidiary</key>
+ </entry>
+ <entry>
+ <key>promotion target by - solicits</key>
+ </entry>
+ <entry>
+ <key>supervisor of - reports to</key>
+ </entry>
+ <entry>
+ <key>acquainted with</key>
+ </entry>
+ <entry>
+ <key>collaboration with</key>
+ </entry>
+ <entry>
+ <key>parent company</key>
+ </entry>
+ <entry>
+ <key>society</key>
+ </entry>
+ <entry>
+ <key>ankle of</key>
+ </entry>
+ <entry>
+ <key>solicits</key>
+ </entry>
+ <entry>
+ <key>child of</key>
+ </entry>
+ <entry>
+ <key>supervisor of</key>
+ </entry>
+ <entry>
+ <key>supports - supported by</key>
+ </entry>
+ <entry>
+ <key>reports to</key>
+ </entry>
+ <entry>
+ <key>subsidiary</key>
+ </entry>
+ <entry>
+ <key>supported by</key>
+ </entry>
+ <entry>
+ <key>member</key>
+ </entry>
+ <entry>
+ <key>promotion target by</key>
+ </entry>
+ <entry>
+ <key>supports</key>
+ </entry>
+ <entry>
+ <key>parent of</key>
+ </entry>
+ <entry>
+ <key>grandparents of</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
@@ -2414,7 +2513,10 @@
union
select AB_LANGUAGE.NAME_LATIN from AB_LANGUAGE
union
-select AB_COUNTRYINFO.NAME_LATIN from AB_COUNTRYINFO</element>
+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>
</statements>
</languageSql>
</sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index d54b0096058..c513b2b07ab 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -983,6 +983,10 @@
<key>Show all offers</key>
<value>Alle Angebote anzeigen</value>
</entry>
+ <entry>
+ <key>child of</key>
+ <value>Kind von</value>
+ </entry>
<entry>
<key>Products</key>
<value>Produkte</value>
@@ -1600,9 +1604,11 @@
</entry>
<entry>
<key>Object 2</key>
+ <value>Objekt 2</value>
</entry>
<entry>
<key>Object 1</key>
+ <value>Objekt 1</value>
</entry>
<entry>
<key>Type 2</key>
@@ -2788,6 +2794,126 @@
<entry>
<key>Tree</key>
</entry>
+ <entry>
+ <key>100%</key>
+ </entry>
+ <entry>
+ <key>grandparents of - ankle of</key>
+ <value>Großeltern von - Enkel/in von</value>
+ </entry>
+ <entry>
+ <key>Mobil</key>
+ </entry>
+ <entry>
+ <key>society - member</key>
+ <value>Verband - Mitglied</value>
+ </entry>
+ <entry>
+ <key>25%</key>
+ </entry>
+ <entry>
+ <key>supports - supported by</key>
+ <value>Unterstützt - Wird unterstützt von</value>
+ </entry>
+ <entry>
+ <key>parent of - child of</key>
+ <value>Elternteil von - Kind von</value>
+ </entry>
+ <entry>
+ <key>50%</key>
+ </entry>
+ <entry>
+ <key>75%</key>
+ </entry>
+ <entry>
+ <key>Verknüpfungen</key>
+ </entry>
+ <entry>
+ <key>no keyword attribute \&quot;%0\&quot; found in keyword container \&quot;%1\&quot;</key>
+ </entry>
+ <entry>
+ <key>competitor</key>
+ <value>Konkurrent</value>
+ </entry>
+ <entry>
+ <key>0%</key>
+ </entry>
+ <entry>
+ <key>parent company - subsidiary</key>
+ <value>Konzernmutter - Tochtergesellschaft</value>
+ </entry>
+ <entry>
+ <key>promotion target by - solicits</key>
+ <value>Werbezielgruppe von - Bewirbt</value>
+ </entry>
+ <entry>
+ <key>supervisor of - reports to</key>
+ <value>Vorgesetzter von - Bewirbt</value>
+ </entry>
+ <entry>
+ <key>acquainted with</key>
+ <value>Bekannt mit</value>
+ </entry>
+ <entry>
+ <key>collaboration with</key>
+ <value>Zusammenarbeit mit</value>
+ </entry>
+ <entry>
+ <key>parent company</key>
+ <value>Konzernmutter</value>
+ </entry>
+ <entry>
+ <key>society</key>
+ <value>Verband</value>
+ </entry>
+ <entry>
+ <key>ankle of</key>
+ <value>Enkel/in von</value>
+ </entry>
+ <entry>
+ <key>solicits</key>
+ <value>Bewirbt</value>
+ </entry>
+ <entry>
+ <key>supervisor of</key>
+ <value>Vorgesetzter von</value>
+ </entry>
+ <entry>
+ <key>reports to</key>
+ <value>Berichtet an</value>
+ </entry>
+ <entry>
+ <key>subsidiary</key>
+ <value>Tochtergesellschaft</value>
+ </entry>
+ <entry>
+ <key>supported by</key>
+ <value>Wird unterstützt von</value>
+ </entry>
+ <entry>
+ <key>member</key>
+ <value>Mitglied</value>
+ </entry>
+ <entry>
+ <key>promotion target by</key>
+ <value>Werbezielgruppe von</value>
+ </entry>
+ <entry>
+ <key>supports</key>
+ <value>Unterstützt</value>
+ </entry>
+ <entry>
+ <key>parent of</key>
+ <value>Elternteil von</value>
+ </entry>
+ <entry>
+ <key>grandparents of</key>
+ <value>Großeltern von</value>
+ </entry>
+ <entry>
+ <key>supporter - supported</key>
+ <value>Unterstützt - Wird unterstützt von</value>
+ </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 6eab811a57e..6af4c86de68 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2427,6 +2427,105 @@
<entry>
<key>Tree</key>
</entry>
+ <entry>
+ <key>100%</key>
+ </entry>
+ <entry>
+ <key>grandparents of - ankle of</key>
+ </entry>
+ <entry>
+ <key>Mobil</key>
+ </entry>
+ <entry>
+ <key>society - member</key>
+ </entry>
+ <entry>
+ <key>25%</key>
+ </entry>
+ <entry>
+ <key>supporter - supported</key>
+ </entry>
+ <entry>
+ <key>parent of - child of</key>
+ </entry>
+ <entry>
+ <key>50%</key>
+ </entry>
+ <entry>
+ <key>75%</key>
+ </entry>
+ <entry>
+ <key>Verknüpfungen</key>
+ </entry>
+ <entry>
+ <key>no keyword attribute \&quot;%0\&quot; found in keyword container \&quot;%1\&quot;</key>
+ </entry>
+ <entry>
+ <key>competitor</key>
+ </entry>
+ <entry>
+ <key>0%</key>
+ </entry>
+ <entry>
+ <key>parent company - subsidiary</key>
+ </entry>
+ <entry>
+ <key>promotion target by - solicits</key>
+ </entry>
+ <entry>
+ <key>supervisor of - reports to</key>
+ </entry>
+ <entry>
+ <key>acquainted with</key>
+ </entry>
+ <entry>
+ <key>collaboration with</key>
+ </entry>
+ <entry>
+ <key>parent company</key>
+ </entry>
+ <entry>
+ <key>society</key>
+ </entry>
+ <entry>
+ <key>ankle of</key>
+ </entry>
+ <entry>
+ <key>solicits</key>
+ </entry>
+ <entry>
+ <key>child of</key>
+ </entry>
+ <entry>
+ <key>supervisor of</key>
+ </entry>
+ <entry>
+ <key>supports - supported by</key>
+ </entry>
+ <entry>
+ <key>reports to</key>
+ </entry>
+ <entry>
+ <key>subsidiary</key>
+ </entry>
+ <entry>
+ <key>supported by</key>
+ </entry>
+ <entry>
+ <key>member</key>
+ </entry>
+ <entry>
+ <key>promotion target by</key>
+ </entry>
+ <entry>
+ <key>supports</key>
+ </entry>
+ <entry>
+ <key>parent of</key>
+ </entry>
+ <entry>
+ <key>grandparents of</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/others/db_changes/data_alias/basic/2019.2/add_ObjectRelationKeyword.xml b/others/db_changes/data_alias/basic/2019.2/add_ObjectRelationKeyword.xml
index 6f4fab3fe32..d62b568bdd6 100644
--- a/others/db_changes/data_alias/basic/2019.2/add_ObjectRelationKeyword.xml
+++ b/others/db_changes/data_alias/basic/2019.2/add_ObjectRelationKeyword.xml
@@ -118,7 +118,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d912e828-a3de-4798-b169-52db380d6d1c"/>
<column name="KEYID" value="1276bd28-7cac-4445-8d73-2ee99d97bfc7"/>
- <column name="TITLE" value="supporter - supported"/>
+ <column name="TITLE" value="supports - supported by"/>
<column name="CONTAINER" value="ObjectRelationType"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
@@ -128,13 +128,13 @@
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="00e6118c-5c94-49c9-b0da-f46575540148"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f81d079-d404-4bda-a7c7-b830ed3d80d5"/>
<column name="AB_KEYWORD_ENTRY_ID" value="d912e828-a3de-4798-b169-52db380d6d1c"/>
- <column name="CHAR_VALUE" value="supporter"/>
+ <column name="CHAR_VALUE" value="supports"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="b5ad48e3-1a96-4357-bae7-977835defcf2"/>
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="e8c85be3-1acb-45f6-aeea-726ba5811ab8"/>
<column name="AB_KEYWORD_ENTRY_ID" value="d912e828-a3de-4798-b169-52db380d6d1c"/>
- <column name="CHAR_VALUE" value="supported"/>
+ <column name="CHAR_VALUE" value="supported by"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1f7f6020-298d-430c-a1f4-ca0ca334ff67"/>
--
GitLab