From 97bc106671c6fe6679e48d07ae886d43b15cee9d Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Thu, 19 Dec 2019 13:55:35 +0000
Subject: [PATCH] Attributes: rename button
(cherry picked from commit e55a310279f01d60ea18738bd09638305d010604)
---
entity/Attribute_entity/Attribute_entity.aod | 3 +--
.../children/newchildattribute/tooltipProcess.js | 4 ----
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 6 +++---
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 ++++----
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 +++---
5 files changed, 11 insertions(+), 16 deletions(-)
delete mode 100644 entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 492a65f54e..e0fb05595b 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -388,13 +388,12 @@
<children>
<entityActionField>
<name>newChildAttribute</name>
- <title>New attribute</title>
+ <title>New child attribute</title>
<onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:FILE_TREE_SMALL</iconId>
- <tooltipProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js</tooltipProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js
deleted file mode 100644
index 8e60c9408c..0000000000
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.string(translate.text("New attribute"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index a4ab00278f..f4baccd29a 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2181,9 +2181,6 @@
<entry>
<key>Special price list</key>
</entry>
- <entry>
- <key>New attribute</key>
- </entry>
<entry>
<key>MQC</key>
</entry>
@@ -5948,6 +5945,9 @@
<entry>
<key>grandchild of</key>
</entry>
+ <entry>
+ <key>New child attribute</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 0b319e9a4a..a60df8bb34 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2146,10 +2146,6 @@
<key>Paraguay</key>
<value>Paraguay</value>
</entry>
- <entry>
- <key>New attribute</key>
- <value>Neues Attribut</value>
- </entry>
<entry>
<key>Solomon Islands</key>
<value>Salomon-Inseln</value>
@@ -7474,6 +7470,10 @@
<entry>
<key>series delete action</key>
</entry>
+ <entry>
+ <key>New child attribute</key>
+ <value>Untergeordnete Eigenschaft anlegen</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 86c3b95de6..e07f1c06f3 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2196,9 +2196,6 @@
<entry>
<key>Special price list</key>
</entry>
- <entry>
- <key>New attribute</key>
- </entry>
<entry>
<key>MQC</key>
</entry>
@@ -5998,6 +5995,9 @@
<entry>
<key>grandchild of</key>
</entry>
+ <entry>
+ <key>New child attribute</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab