Merge branch 'language_file_cleanup' into 'dev'

clean language files, prefix keys

See merge request !31

.npmrc

-@aditosoftware:registry=https://nexus.adito.cloud/repository/xrm
+@aditosoftware:registry=https://gitlab.adito.de/api/v4/packages/npm/

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.0.0]
+
+### Removed
+
+- Deleted translations unrelated to the module
+- Removed user settings "userCurrency", "incomingCallContext", "prefferredApprover"
+
 ## [5.0.3] - 2024-08-29
 
 ### Fixed

entity/Context_entity/Context_entity.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.4.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.4.0">
   <name>Context_entity</name>
-  <title>Context</title>
+  <title>root.Context_entity.title</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
   <contentTitleProcess>%aditoprj%/entity/Context_entity/contentTitleProcess.js</contentTitleProcess>
-  <titlePlural>Contexts</titlePlural>
+  <titlePlural>root.Context_entity.titlePlural</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>
@@ -14,11 +14,11 @@
     </entityProvider>
     <entityField>
       <name>UID</name>
-      <title>Context id</title>
+      <title>root.Context_entity.UID.title</title>
     </entityField>
     <entityField>
       <name>CONTEXT_NAME</name>
-      <title>Context name</title>
+      <title>root.Context_entity.CONTEXT_NAME.title</title>
     </entityField>
     <entityProvider>
       <name>Context</name>

entity/Context_entity/entityfields/visitplanentrylinkable_s/children/blacklist_param/valueProcess.js

-import { result } from "@aditosoftware/jdito-types";
-
-result.object(["Salesproject", "Offer"]);

entity/DefaultAdminView_entity/DefaultAdminView_entity.aod

@@ -46,7 +46,7 @@
     </entityParameter>
     <entityField>
       <name>ENTITY</name>
-      <title>Entity</title>
+      <title>root.DefaultAdminView_entity.ENTITY.title</title>
     </entityField>
   </entityFields>
   <recordContainers>

entity/DefaultAdminView_entity/entityfields/rows/children/rows_param/valueProcess.js

@@ -6,5 +6,5 @@ if (tools.currentUserHasRole("INTERNAL_ADMINISTRATOR"))
 }
 else  //this should not be the case since the action should be invisible
 {
-    result.string(JSON.stringify([["0", "", translate.text("You don't have permission for this view."), "TEXT"]]));
+    result.string(JSON.stringify([["0", "", translate.text("root.You don't have permission for this view."), "TEXT"]]));
 }
\ No newline at end of file

entity/Object_entity/recordcontainers/jdito/contentProcess.js

@@ -16,9 +16,9 @@ if (vars.get("$param.ObjectType_param"))
     }
     
     var contactId;
-    if (vars.exists("$param.ContactId") && vars.get("$param.ContactId"))
+    if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
     {
-        contactId = vars.get("$param.ContactId");
+        contactId = vars.get("$param.ContactId_param");
     }
     
     result.object(ContextUtils.loadContent(ProjectModelUtils.getEntityByContext(objectType), [contactId], ["#UID", "#CONTENTTITLE"], excludedIds));

entity/Usersettings_entity/Usersettings_entity.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.4.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.4.0">
   <name>Usersettings_entity</name>
-  <title>Settings</title>
+  <title>root.Usersettings_entity.title</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Usersettings_entity/documentation.adoc</documentation>
   <grantDelete v="false" />
   <afterUiInit>%aditoprj%/entity/Usersettings_entity/afterUiInit.js</afterUiInit>
-  <titlePlural>Settings</titlePlural>
+  <titlePlural>root.Usersettings_entity.titlePlural</titlePlural>
   <recordContainer>jdito</recordContainer>
   <entityFields>
     <entityProvider>
@@ -14,13 +14,13 @@
     </entityProvider>
     <entityField>
       <name>calHourdivider</name>
-      <title>Calendar hour divider</title>
+      <title>root.Usersettings_entity.calHourdivider.title</title>
       <contentType>NUMBER</contentType>
       <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js</dropDownProcess>
     </entityField>
     <entityField>
       <name>calMaintimeEnd</name>
-      <title>Calendar maintime end</title>
+      <title>root.Usersettings_entity.calMaintimeEnd.title</title>
       <contentType>NUMBER</contentType>
       <placeholder>HH:mm</placeholder>
       <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimeend/dropDownProcess.js</dropDownProcess>
@@ -28,7 +28,7 @@
     </entityField>
     <entityField>
       <name>calMaintimeStart</name>
-      <title>Calendar maintime start</title>
+      <title>root.Usersettings_entity.calMaintimeStart.title</title>
       <contentType>NUMBER</contentType>
       <placeholder>HH:mm</placeholder>
       <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/calmaintimestart/dropDownProcess.js</dropDownProcess>
@@ -36,29 +36,29 @@
     </entityField>
     <entityField>
       <name>UID</name>
-      <title>UID</title>
+      <title>root.Usersettings_entity.UID.title</title>
     </entityField>
     <entityField>
       <name>selectionIgnoreCase</name>
-      <title>Selection ignore case</title>
+      <title>root.Usersettings_entity.selectionIgnoreCase.title</title>
       <contentType>BOOLEAN</contentType>
       <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js</dropDownProcess>
     </entityField>
     <entityField>
       <name>selectionPlaceholder</name>
-      <title>Selection placeholder</title>
+      <title>root.Usersettings_entity.selectionPlaceholder.title</title>
       <contentType>NUMBER</contentType>
       <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js</dropDownProcess>
     </entityField>
     <entityField>
       <name>jPassword</name>
-      <title>New password</title>
+      <title>root.Usersettings_entity.jPassword.title</title>
       <contentType>PASSWORD</contentType>
       <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/jpassword/onValidation.js</onValidation>
     </entityField>
     <entityField>
       <name>jPasswordRepeat</name>
-      <title>Repeat password</title>
+      <title>root.Usersettings_entity.jPasswordRepeat.title</title>
       <contentType>PASSWORD</contentType>
       <onValueChangeTypes>
         <element>MASK</element>
@@ -72,7 +72,7 @@
     </entityField>
     <entityField>
       <name>currentPassword</name>
-      <title>Current password</title>
+      <title>root.Usersettings_entity.currentPassword.title</title>
       <contentType>PASSWORD</contentType>
       <stateProcess>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/stateProcess.js</stateProcess>
       <onValidation>%aditoprj%/entity/Usersettings_entity/entityfields/currentpassword/onValidation.js</onValidation>
@@ -81,52 +81,9 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
-    <entityField>
-      <name>userCurrency</name>
-      <title>User Currency</title>
-      <consumer></consumer>
-      <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js</dropDownProcess>
-      <displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityField>
-      <name>incomingCallContext</name>
-      <title>Call context</title>
-      <consumer>KeywordIncomingCallContext_consumer</consumer>
-      <displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>KeywordIncomingCallContext_consumer</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
-      </dependency>
-      <children>
-        <entityParameter>
-          <name>ContainerName_param</name>
-          <valueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js</valueProcess>
-        </entityParameter>
-      </children>
-    </entityConsumer>
-    <entityField>
-      <name>prefferredApprover</name>
-      <documentation>%aditoprj%/entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc</documentation>
-      <title>Preferred approver</title>
-      <description>used by "Approval Workflows"</description>
-      <consumer>Employees</consumer>
-      <displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js</displayValueProcess>
-    </entityField>
-    <entityConsumer>
-      <name>Employees</name>
-      <dependency>
-        <name>dependency</name>
-        <entityName>Employee_entity</entityName>
-        <fieldName>Employees</fieldName>
-      </dependency>
-    </entityConsumer>
     <entityField>
       <name>sendNotificationAsMail</name>
-      <title>Get mail notifications</title>
+      <title>root.Usersettings_entity.sendNotificationAsMail.title</title>
       <contentType>BOOLEAN</contentType>
       <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/sendnotificationasmail/dropDownProcess.js</dropDownProcess>
       <state>AUTO</state>
@@ -137,6 +94,9 @@
     <entityFieldExtensionPoint>
       <name>Settings_FieldExtensionPoint</name>
     </entityFieldExtensionPoint>
+    <entityConsumerExtensionPoint>
+      <name>Usersettings_ConsumerExtensionPoint</name>
+    </entityConsumerExtensionPoint>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -171,15 +131,6 @@
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
         </jDitoRecordFieldMapping>
-        <jDitoRecordFieldMapping>
-          <name>userCurrency.value</name>
-        </jDitoRecordFieldMapping>
-        <jDitoRecordFieldMapping>
-          <name>incomingCallContext.value</name>
-        </jDitoRecordFieldMapping>
-        <jDitoRecordFieldMapping>
-          <name>prefferredApprover.value</name>
-        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>sendNotificationAsMail.value</name>
         </jDitoRecordFieldMapping>

entity/Usersettings_entity/entityfields/calhourdivider/dropDownProcess.js

 import { result, translate } from "@aditosoftware/jdito-types";
 
 result.object([
-    ["1", "1 " + translate.text("hour")],
-    ["2", "2 " + translate.text("hours")],
-    ["4", "4 " + translate.text("hours")],
-    ["6", "6 " + translate.text("hours")]
+    ["1", "1 " + translate.text("root.hour")],
+    ["2", "2 " + translate.text("root.hours")],
+    ["4", "4 " + translate.text("root.hours")],
+    ["6", "6 " + translate.text("root.hours")]
 ]);
\ No newline at end of file

entity/Usersettings_entity/entityfields/calmaintimeend/onValidation.js

@@ -5,5 +5,5 @@ let startValue = vars.get("$field.calMaintimeStart");
 
 if(endValue && startValue && parseFloat(startValue) >= parseFloat(endValue)) 
 {
-    result.string(translate.text("End time must be later than start time"));
+    result.string(translate.text("root.End time must be later than start time"));
 }

entity/Usersettings_entity/entityfields/calmaintimestart/onValidation.js

@@ -5,5 +5,5 @@ let endValue = vars.get("$field.calMaintimeEnd");
 
 if(startValue && endValue && parseFloat(endValue) <= parseFloat(startValue)) 
 {
-    result.string(translate.text("Start time must be earlier than end time"));
+    result.string(translate.text("root.Start time must be earlier than end time"));
 }

entity/Usersettings_entity/entityfields/currentpassword/onValidation.js

@@ -7,5 +7,5 @@ let password = vars.get("$local.value");
 if(vars.get("$property.currentPassword.state") !== neon.COMPONENTSTATE_INVISIBLE
     && password && !tools.verifyPassword(login, password, true)) 
 {
-    result.string(translate.text("Wrong password"));
+    result.string(translate.text("root.Wrong password"));
 }
\ No newline at end of file

entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js

-import { result, vars } from "@aditosoftware/jdito-types";
-import { KeywordUtils } from "Keyword_lib";
-import { $KeywordRegistry } from "KeywordRegistry_basic";
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.incomingCallContext(), vars.get("$field.incomingCallContext")));
\ No newline at end of file

entity/Usersettings_entity/entityfields/jpassword/onValidation.js

@@ -11,11 +11,11 @@ if(newPassword)
     {
         if(!currentPassword) 
         {
-            messages.push(translate.text("Enter current password to verify"));
+            messages.push(translate.text("root.Enter current password to verify"));
         }
         else if(newPassword === currentPassword) 
         {
-            messages.push(translate.text("New password must not be the same as the current password"));
+            messages.push(translate.text("root.New password must not be the same as the current password"));
         }
     }
 

entity/Usersettings_entity/entityfields/jpasswordrepeat/onValidation.js

@@ -5,5 +5,5 @@ let newPassword = vars.get("$field.jPassword");
 
 if(newPassword !== passwordRepeat)
 {
-    result.string(translate.text("Password and confirmation must be the same!"));
+    result.string(translate.text("root.Password and confirmation must be the same!"));
 }

entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js

-import { result } from "@aditosoftware/jdito-types";
-import { $KeywordRegistry } from "KeywordRegistry_basic";
-
-result.string($KeywordRegistry.incomingCallContext());
\ No newline at end of file

entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js

-import { result, vars } from "@aditosoftware/jdito-types";
-import { Contact, ContactTitleRenderer } from "Contact_lib";
-import { newSelect } from "SqlBuilder_lib";
-
-var contactId = vars.get("$field.prefferredApprover");
-if(contactId)
-{
-    var contact = new Contact();
-    [contact.salutation, contact.title, contact.firstname, contact.middlename, contact.lastname] 
-    = newSelect("PERSON.SALUTATION, PERSON.TITLE, PERSON.FIRSTNAME, PERSON.MIDDLENAME, PERSON.LASTNAME", "Data_alias")
-            .from("CONTACT")
-            .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
-            .whereIfSet("CONTACT.CONTACTID", contactId)
-            .arrayRow(true);
-    result.string(new ContactTitleRenderer(contact,  ContactTitleRenderer.OPTIONS.NoOption)
-        .asString());
-}

entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc

-== Preffered approver
-this will be used as the default value for "Approver" when the user try to start a Approval Workflow (with Person option).
-For example for Service ticket
-
-== used for: 
-"Approval" workflows with _person  
-and a start view from WorkflowApprove context. For example "WorkflowApproveStartWithApprover_view"
-
-== STATE property
-per default is this field "invisible"
-

entity/Usersettings_entity/entityfields/selectionignorecase/dropDownProcess.js

 import { result, translate } from "@aditosoftware/jdito-types";
  
 result.object([
-    ["true", translate.text("True")],
-    ["false", translate.text("False")]
+    ["true", translate.text("root.True")],
+    ["false", translate.text("root.False")]
 ]);

entity/Usersettings_entity/entityfields/selectionplaceholder/dropDownProcess.js

 import { result, tools, translate  } from "@aditosoftware/jdito-types";
 
 result.object([
-    [tools.SELECTION_POSTFIX, translate.text("SELECTION_POSTFIX")],
-    [tools.SELECTION_PREFIX, translate.text("SELECTION_PREFIX")],
-    [tools.SELECTION_BOTH, translate.text("SELECTION_BOTH")],
-    [tools.SELECTION_NEITHER, translate.text("SELECTION_NEITHER")],
-    [tools.SELECTION_NULL, translate.text("SELECTION_NULL")]
+    [tools.SELECTION_POSTFIX, translate.text("root.SELECTION_POSTFIX")],
+    [tools.SELECTION_PREFIX, translate.text("root.SELECTION_PREFIX")],
+    [tools.SELECTION_BOTH, translate.text("root.SELECTION_BOTH")],
+    [tools.SELECTION_NEITHER, translate.text("root.SELECTION_NEITHER")],
+    [tools.SELECTION_NULL, translate.text("root.SELECTION_NULL")]
 ]);