From 169d26a85f8eb219418d99b28d4bd0913fa60a69 Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Fri, 5 Feb 2021 17:49:57 +0100
Subject: [PATCH] Missing translations added
---
.../DocumentTemplate_entity.aod | 94 +++++++++----------
.../onActionProcess.js | 0
.../stateProcess.js | 0
.../_____LANGUAGE_EXTRA.aod | 3 +
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 +
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +
.../DocumentTemplateHtmlEdit_view.aod | 2 +-
7 files changed, 58 insertions(+), 48 deletions(-)
rename entity/DocumentTemplate_entity/entityfields/{htmleditor => openhtmleditor}/onActionProcess.js (100%)
rename entity/DocumentTemplate_entity/entityfields/{htmleditor => openhtmleditor}/stateProcess.js (100%)
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index af8a859b1fe..30e957717bd 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -94,6 +94,11 @@
</entityField>
<entityConsumer>
<name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>AssignmentTable_param</name>
@@ -104,11 +109,6 @@
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Languages</name>
@@ -120,22 +120,27 @@
</entityConsumer>
<entityConsumer>
<name>KeywordDocumentTemplateType</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
@@ -146,11 +151,6 @@
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
</entityConsumer>
<entityField>
<name>Content</name>
@@ -176,6 +176,11 @@
</entityField>
<entityConsumer>
<name>DocumentTemplateTypeCategory</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateTypeCategory_entity</entityName>
+ <fieldName>ByCategory</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>usageFilter_param</name>
@@ -183,11 +188,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplateTypeCategory_entity</entityName>
- <fieldName>ByCategory</fieldName>
- </dependency>
</entityConsumer>
<entityProvider>
<name>Attachments</name>
@@ -208,6 +208,11 @@
<entityConsumer>
<name>Links</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentId_param</name>
@@ -220,11 +225,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplateLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>DocumentTemplateTypeClassification_param</name>
@@ -234,12 +234,6 @@
<entityProvider>
<name>DocumentTemplateProvider</name>
<documentation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateprovider/documentation.adoc</documentation>
- <children>
- <entityParameter>
- <name>ComingFrom_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
<dependencies>
<entityDependency>
<name>9c10883d-eb73-4587-b758-693a66367a4c</name>
@@ -284,6 +278,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -294,13 +294,6 @@
<name>TARGET_CONTEXT</name>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
</entityField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityField>
<name>REPLACEMENTNAME</name>
<title>Replacement name</title>
@@ -322,6 +315,11 @@
<name>DocumentTemplatePlaceOfUse</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
+ <fieldName>DocumentTemplatePlaceOfUse</fieldName>
+ </dependency>
<children>
<entityParameter>
<name>DocumentTemplatePlaceOfUse_param</name>
@@ -329,11 +327,6 @@
<expose v="true" />
</entityParameter>
</children>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
- <fieldName>DocumentTemplatePlaceOfUse</fieldName>
- </dependency>
</entityConsumer>
<entityParameter>
<name>ComingFrom_param</name>
@@ -354,12 +347,19 @@
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmledit/valueProcess.js</valueProcess>
</entityField>
<entityActionField>
- <name>HtmlEditor</name>
- <title>Edit HTML file</title>
- <onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmleditor/onActionProcess.js</onActionProcess>
+ <name>openHtmlEditor</name>
+ <title>Edit HTML</title>
+ <onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js</onActionProcess>
<iconId>NEON:PENCIL</iconId>
<state>INVISIBLE</state>
- <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/htmleditor/stateProcess.js</stateProcess>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
</entityFields>
<recordContainers>
diff --git a/entity/DocumentTemplate_entity/entityfields/htmleditor/onActionProcess.js b/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js
similarity index 100%
rename from entity/DocumentTemplate_entity/entityfields/htmleditor/onActionProcess.js
rename to entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js
diff --git a/entity/DocumentTemplate_entity/entityfields/htmleditor/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js
similarity index 100%
rename from entity/DocumentTemplate_entity/entityfields/htmleditor/stateProcess.js
rename to entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 0b95216e349..fc046f5c17e 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -8073,6 +8073,9 @@
<entry>
<key>Starts the serverprocess manually, which will recalculate all classifications from scratch. Only do this after e.g importing data from elsewhere where the outdated flag couldn't been set correctly. Since this can take some time.</key>
</entry>
+ <entry>
+ <key>Edit HTML</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 17cd3699113..cb1a2ac028c 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2950,6 +2950,10 @@
<key>Tonga</key>
<value>Tonga</value>
</entry>
+ <entry>
+ <key>Edit HTML</key>
+ <value>HTML bearbeiten</value>
+ </entry>
<entry>
<key>Western Sahara</key>
<value>Westsahara</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 0c88a62942b..9f4b4dd4769 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -8154,6 +8154,9 @@
<entry>
<key>Starts the serverprocess manually, which will recalculate all classifications from scratch. Only do this after e.g importing data from elsewhere where the outdated flag couldn't been set correctly. Since this can take some time.</key>
</entry>
+ <entry>
+ <key>Edit HTML</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/DocumentTemplateHtmlEdit_view/DocumentTemplateHtmlEdit_view.aod b/neonView/DocumentTemplateHtmlEdit_view/DocumentTemplateHtmlEdit_view.aod
index dc8ce3a6bca..bc2bab9c2c5 100644
--- a/neonView/DocumentTemplateHtmlEdit_view/DocumentTemplateHtmlEdit_view.aod
+++ b/neonView/DocumentTemplateHtmlEdit_view/DocumentTemplateHtmlEdit_view.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
<name>DocumentTemplateHtmlEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
--
GitLab