From 9b186c11e1858f78acdd13a9564251b2256eab49 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Nov 2019 10:25:06 +0100
Subject: [PATCH] translations
---
.../entityfields/startend/valueProcess.js | 25 +++++++------
.../onValidation.js | 5 ++-
.../accesstype/displayValueProcess.js | 13 ++++---
.../_____LANGUAGE_EXTRA.aod | 27 ++++++++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 37 +++++++++++++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 27 ++++++++++++++
6 files changed, 114 insertions(+), 20 deletions(-)
diff --git a/entity/Appointment_entity/entityfields/startend/valueProcess.js b/entity/Appointment_entity/entityfields/startend/valueProcess.js
index 5d76d8d6c6..4a4abfd9ce 100644
--- a/entity/Appointment_entity/entityfields/startend/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/startend/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.result");
import("system.calendars");
import("system.vars");
@@ -9,10 +10,10 @@ var endLong = vars.get("$field.END");
if(startLong != null && endLong != null)
{
- var startdate = datetime.toDate(startLong, "dd.MM.yyyy");
- var enddate = datetime.toDate(endLong, "dd.MM.yyyy");
- var starttime = datetime.toDate(startLong, "HH:mm");
- var endtime = datetime.toDate(endLong, "HH:mm");
+ var startdate = datetime.toDate(startLong, translate.text("dd.MM.yyyy"));
+ var enddate = datetime.toDate(endLong, translate.text("dd.MM.yyyy"));
+ var starttime = datetime.toDate(startLong, translate.text("HH:mm"));
+ var endtime = datetime.toDate(endLong, translate.text("HH:mm"));
//wenn der termin an einem tag beginnt UND endet
if(startdate == enddate)
@@ -21,13 +22,13 @@ if(startLong != null && endLong != null)
datetime.isTomorrow(startLong))
{
if(datetime.isToday(startLong))
- result.string("heute " + " | " + starttime + " - " + endtime + " Uhr");
+ result.string(translate.withArguments("today | %0 - %1 o'clock", [starttime, endtime]));
if(datetime.isTomorrow(startLong))
- result.string("morgen " + " | " + starttime + " - " + endtime + " Uhr");
+ result.string(translate.withArguments("tomorrow | %0 - %1 o'clock", [starttime, endtime]));
}
else
- result.string(startdate + " | " + starttime + " - " + endtime + " Uhr");
+ result.string(translate.withArguments("%0 | %1 - %2 o'clock", [startdate, starttime, endtime]));
}
//wenn der termin über mehrere tage geht
@@ -37,20 +38,20 @@ if(startLong != null && endLong != null)
var dateend;
if(datetime.isToday(startLong))
- datebegin = "heute";
+ datebegin = translate.text("today");
else if(datetime.isTomorrow(startLong))
- datebegin = "morgen";
+ datebegin = translate.text("tomorrow");
else
datebegin = startdate;
if(datetime.isToday(endLong))
- dateend = "heute";
+ dateend = ranslate.text("today");
else if(datetime.isTomorrow(endLong))
- dateend = "morgen";
+ dateend = ranslate.text("tomorrow");
else
dateend = enddate;
- result.string(datebegin + " | " + starttime + " Uhr - " + dateend + " | " + endtime + " Uhr");
+ result.string(translate.withArguments("%0 | %1 o'clock - %2 | %3 o'clock", [datebegin, starttime, dateend, endtime]));
}
}
else
diff --git a/entity/CampaignAddParticipants_entity/onValidation.js b/entity/CampaignAddParticipants_entity/onValidation.js
index dab93d8683..26f9361c06 100644
--- a/entity/CampaignAddParticipants_entity/onValidation.js
+++ b/entity/CampaignAddParticipants_entity/onValidation.js
@@ -1,7 +1,8 @@
+import("system.translate");
import("system.vars");
import("system.result");
if (vars.get("$field.isOperationValid") == "false")
{
- result.object("Keine gültige Auswahl");
-}
+ result.object(translate.text("no valid selection"));
+}
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js b/entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js
index b759a77254..366a3b45d7 100644
--- a/entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js
+++ b/entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("system.neon");
import("system.vars");
import("system.result");
@@ -12,13 +13,13 @@ var accesstype = vars.get("$field.ACCESSTYPE");
if (operatingState == neon.OPERATINGSTATE_SEARCH || operatingState == neon.OPERATINGSTATE_VIEW) {
switch (accesstype) {
case "E":
- result.string("Entität");
+ result.string(translate.text("Entity"));
break;
case "R":
- result.string("Datensatz");
+ result.string(translate.text("Dataset"));
break;
case "F":
- result.string("Feld");
+ result.string(translate.text("Field"));
break;
}
} else {
@@ -30,12 +31,12 @@ if (operatingState == neon.OPERATINGSTATE_SEARCH || operatingState == neon.OPERA
var rootPerm = PermissionUtil.getPermissionWithoutCond(rootPermSet);
if (rootPermSet == "" || PermissionUtil.getCondType(rootPerm) == 0) {
- result.string("Entität");
+ result.string(translate.text("Entity"));
} else {
- result.string("Datensatz");
+ result.string(translate.text("Dataset"));
}
if (field != undefined && field != null && field != "") {
- result.string("Feld");
+ result.string(translate.text("Field"));
}
}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 2cb9d27e89..fd871c36e8 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5879,6 +5879,33 @@
<entry>
<key>SqlBuilder: invalid value-type for pFieldOrCond. It can be a fully qualified SqlBuilder (e.g. select, from, ... have to be set) or an jdito-prepared-statement array</key>
</entry>
+ <entry>
+ <key>no valid selection</key>
+ </entry>
+ <entry>
+ <key>tomorrow | %0 - %1 o'clock</key>
+ </entry>
+ <entry>
+ <key>%0 | %1 o'clock - %2 | %3 o'clock</key>
+ </entry>
+ <entry>
+ <key>today</key>
+ </entry>
+ <entry>
+ <key>HH:mm</key>
+ </entry>
+ <entry>
+ <key>%0 | %1 - %2 o'clock</key>
+ </entry>
+ <entry>
+ <key>today | %0 - %1 o'clock</key>
+ </entry>
+ <entry>
+ <key>tomorrow</key>
+ </entry>
+ <entry>
+ <key>Dataset</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 202b9fe6e7..55e00e9e46 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -4950,6 +4950,7 @@
</entry>
<entry>
<key>Entity</key>
+ <value>Entität</value>
</entry>
<entry>
<key>Field</key>
@@ -4960,6 +4961,7 @@
</entry>
<entry>
<key>Entities</key>
+ <value></value>
</entry>
<entry>
<key>Read</key>
@@ -7382,6 +7384,41 @@
<entry>
<key>SqlBuilder: invalid value-type for pFieldOrCond. It can be a fully qualified SqlBuilder (e.g. select, from, ... have to be set) or an jdito-prepared-statement array</key>
</entry>
+ <entry>
+ <key>no valid selection</key>
+ <value>keine gültige Auswahl</value>
+ </entry>
+ <entry>
+ <key>tomorrow | %0 - %1 o'clock</key>
+ <value>morgen | %0 - %1 Uhr</value>
+ </entry>
+ <entry>
+ <key>%0 | %1 o'clock - %2 | %3 o'clock</key>
+ <value>%0 | %1 Uhr - %2 | %3 Uhr</value>
+ </entry>
+ <entry>
+ <key>today</key>
+ <value>heute</value>
+ </entry>
+ <entry>
+ <key>HH:mm</key>
+ </entry>
+ <entry>
+ <key>%0 | %1 - %2 o'clock</key>
+ <value>%0 | %1 - %2 Uhr</value>
+ </entry>
+ <entry>
+ <key>today | %0 - %1 o'clock</key>
+ <value>heute | %0 - %1 Uhr</value>
+ </entry>
+ <entry>
+ <key>tomorrow</key>
+ <value>morgen</value>
+ </entry>
+ <entry>
+ <key>Dataset</key>
+ <value>Datensatz</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 8075e426bf..aaf99e130a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5929,6 +5929,33 @@
<entry>
<key>SqlBuilder: invalid value-type for pFieldOrCond. It can be a fully qualified SqlBuilder (e.g. select, from, ... have to be set) or an jdito-prepared-statement array</key>
</entry>
+ <entry>
+ <key>no valid selection</key>
+ </entry>
+ <entry>
+ <key>tomorrow | %0 - %1 o'clock</key>
+ </entry>
+ <entry>
+ <key>%0 | %1 o'clock - %2 | %3 o'clock</key>
+ </entry>
+ <entry>
+ <key>today</key>
+ </entry>
+ <entry>
+ <key>HH:mm</key>
+ </entry>
+ <entry>
+ <key>%0 | %1 - %2 o'clock</key>
+ </entry>
+ <entry>
+ <key>today | %0 - %1 o'clock</key>
+ </entry>
+ <entry>
+ <key>tomorrow</key>
+ </entry>
+ <entry>
+ <key>Dataset</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab