From 05272b13a56f1d1586cd34ff4a3c3ba0ddcf782a Mon Sep 17 00:00:00 2001
From: Daniel Tran <d.tran@adito.de>
Date: Wed, 5 Aug 2020 08:07:37 +0000
Subject: [PATCH] #1062997: Changed naming for email sent button in
EmailEdit_view.
---
.liquibase/Data_alias/changelog.xml | 2 +-
aliasDefinition/Data_alias/Data_alias.aod | 14 +++++++-------
entity/Email_entity/Email_entity.aod | 2 +-
.../_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 12 +++++++++---
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 13 +++++--------
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 13 +++++++++++++
6 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index a8cc53b4069..24d4ba7c1a6 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,7 +14,7 @@
<include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
-
+ <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
<!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 324bae9d14c..b5691bb450a 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -6339,10 +6339,10 @@
<name>ACTIVITY_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="63" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -8382,13 +8382,13 @@
<entityFieldDb>
<name>DOCUMENTTEMPLATEID</name>
<dbName></dbName>
- <primaryKey v="true" />
+ <primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index fc65d44a8a9..ba88dbf6fb2 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -119,7 +119,7 @@
</entityParameter>
<entityActionField>
<name>sendMail</name>
- <title>send mail</title>
+ <title>{SEND_MAIL}</title>
<onActionProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/stateProcess.js</stateProcess>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 42409fc7a72..e3bb15b7fc4 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6867,10 +6867,16 @@
<key>download ready</key>
</entry>
<entry>
- <key>Add new Department Permission</key>
+ <key>Workflow Model</key>
</entry>
- <entry>
- <key>Add new User Permission</key>
+ <entry>
+ <key>{SENT_MAIL}</key>
+ </entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index a0f4cebe765..473942e04d9 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -8783,20 +8783,17 @@ Bitte Datumseingabe prüfen</value>
<value>E-Mail losschicken</value>
</entry>
<entry>
- <key>Download letter and create Activity</key>
- <value>Brief herunterladen und Aktivität erstellen</value>
+ <key>Workflow Model</key>
</entry>
<entry>
- <key>Add Participants</key>
- <value>Teilnehmer hinzufügen</value>
+ <key>{SEND_MAIL}</key>
+ <value>Email versenden</value>
</entry>
<entry>
- <key>and open Report</key>
- <value>und Report öffnen</value>
+ <key>The workflow could not be deployed</key>
</entry>
<entry>
- <key>Add Recipients</key>
- <value>Empfänger hinzufügen</value>
+ <key>Workflow deploy failed</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 831943f96a2..3d79166f31f 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6932,6 +6932,19 @@
<entry>
<key>download ready</key>
</entry>
+ <entry>
+ <key>Workflow Model</key>
+ </entry>
+ <entry>
+ <key>{SEND_MAIL}</key>
+ <value>Send mail</value>
+ </entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab