Pull request #149: [EDELIVERY-13818] fix locale configuration for docker to be...

Pull request #149: [EDELIVERY-13818] fix locale configuration for docker to be inside smo folder for dockers

Merge in EDELIVERY/smp from bugfix/EDELIVERY-13818-fix-locale-folder-dockers to development

* commit '3b2f11fb':
  [EDELIVERY-13818] fix locale configuration for docker to be inside smo folder for dockers

domismp-tests/domismp-docker/images/domismp-springboot-mysql/entrypoint.sh

@@ -108,6 +108,7 @@ init_smp() {
   # set smp data/security folder
   mkdir -p "${SMP_HOME}/smp/"
   mkdir -p  "${SMP_HOME}/smp-libs"
+  mkdir -p ${DATA_DIR}/smp/locales
   # copy smp keystore with sml authorized sml certificates
   cp /tmp/artefacts/shared-artefacts/smp-logback.xml "${SMP_HOME}/logback.xml"
   cp "/tmp/artefacts/shared-artefacts/smp-keystore-docker-demo.p12" "${SMP_HOME}/smp/smp-keystore-docker-demo.p12"
@@ -127,7 +128,7 @@ init_smp_properties() {
     echo "# SMP init parameters"
     echo "smp.security.folder=${SMP_HOME}/smp/"
     echo "smp.libraries.folder=${SMP_HOME}/smp-libs"
-    echo "smp.locale.folder=${SMP_HOME}/locales"
+    echo "smp.locale.folder=${SMP_HOME}/smp/locales"
     echo "smp.automation.authentication.external.tls.clientCert.enabled=true"
     echo "bdmsl.integration.enabled=false"
     echo "bdmsl.participant.multidomain.enabled=false"

domismp-tests/domismp-docker/images/domismp-tomcat-mysql/entrypoint.sh

@@ -85,7 +85,7 @@ init_tomcat() {
   rm -rf ${TOMCAT_HOME}/classes
   ln -sf ${TOMCAT_DIR}/classes ${TOMCAT_HOME}/
   # set smp data/security folder
-  mkdir ${DATA_DIR}/smp/
+  mkdir -p ${DATA_DIR}/smp/locales
 
   # sleep a little to avoid mv issues
   sleep 5s
@@ -243,7 +243,7 @@ init_smp_properties() {
     echo "# SMP init parameters"
     echo "smp.security.folder=${DATA_DIR}/smp/"
     echo "smp.libraries.folder=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp-libs"
-    echo "smp.locale.folder=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/locales"
+    echo "smp.locale.folder=$SMP_HOME/apache-tomcat-$TOMCAT_VERSION/smp/locales"
     echo "bdmsl.integration.logical.address=${SMP_LOGICAL_ADDRESS:-http://localhost:8080/smp/}"
     echo "smp.automation.authentication.external.tls.clientCert.enabled=true"
     echo "bdmsl.integration.enabled=true"

domismp-tests/domismp-docker/images/domismp-weblogic122/properties/init/smp.config.properties

 
 smp.security.folder=/data/smp/security
+smp.locale.folder=/data/smp/locales
 smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
 smp.datasource.jndi=jdbc/eDeliverySmpDs
 smp.automation.authentication.external.tls.clientCert.enabled=true

domismp-tests/domismp-docker/images/domismp-weblogic141/properties/init/smp.config.properties

 
 smp.security.folder=/data/smp/security
+smp.locale.folder=/data/smp/locales
 smp.jdbc.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
 smp.datasource.jndi=jdbc/eDeliverySmpDs
 smp.automation.authentication.external.tls.clientCert.enabled=true

smp-angular/src/assets/i18n/en.json

@@ -93,7 +93,7 @@
   "session.expiration.dialog.button.logout": "Logout",
   "session.expiration.dialog.title": "Extend session",
   "session.expiration.dialog.label.session.about.to.expire": "Your session is about to expire in <b>{{timeLeft}}</b> seconds!<br />Would you like to logout now or extend it<br /> for another <b>{{timeoutMinutes}}</b> minute(s) and <b>{{timeoutSeconds}}</b> second(s)?",
-  "session.alert.message.logout.expired": "Your session has expired, and you have been logged out",
+  "session.alert.message.logout.expired": "Your session has expired, and you have been logged out.",
   "alert.panel.title": "Alerts",
   "alert.panel.user.title": "{{value}} (Email: '{{mailTo}}')",
   "certificate.panel.title": "Selected certificate data",

smp-webapp/src/main/smp-setup/smp.config.properties

@@ -62,8 +62,11 @@ smp.jdbc.password=secret123
 # Extension folder
 # *********************************
 # path where SMP extensions are located. The Folder is loaded by the SMP classloader at startup.
-# smp.libraries.folder=/cef/test/smp/apache-tomcat-8.5.73/smp/ext-lib
-
-
+# smp.libraries.folder=/data/smp/ext-lib
 
 
+# *********************************
+# Locale folder
+# *********************************
+# The locale folder contains the translations for the SMP web application.
+# smp.libraries.folder=/data/smp/locales