Merge pull request #698 from PAWECOGmbH/development

Dev to Staging

Author: ptruessel

compose-dev.yml

@@ -3,7 +3,6 @@ services:
     image: ${LUCEE_IMAGE}:${LUCEE_IMAGE_VERSION}
     ports:
       - "${LUCEE_PORT}:80"
-    restart: always
     container_name: ${LUCEE_CONTAINER_NAME}
     environment:
       - LUCEE_ADMIN_PASSWORD=${LUCEE_ADMIN_PASSWORD}
@@ -20,7 +19,6 @@ services:
     depends_on:
       - lucee
     image: mysql:8.1
-    restart: always
     container_name: ${MYSQL_CONTAINER_NAME}
     ports:
       - "${MYSQL_PORT}:3306"
@@ -60,7 +58,6 @@ services:
   inbucket:
     image: inbucket/inbucket
     container_name: ${INBUCKET_CONTAINER_NAME}
-    restart: always
     ports:
       - "${INBUCKET_WEB_PORT}:9000"
       - "${INBUCKET_SMTP_PORT}:2500"

www/backend/core/com/language.cfc

@@ -71,7 +71,7 @@ component displayname="language" output="false" {
         } else if (structKeyExists(session, "lng")) {
             local.thisLang = session.lng;
         } else {
-            local.thisLang = getDefaultLanguage().iso;
+            local.thisLang = application.objLanguage.getDefaultLanguage().iso;
         }
 
         local.searchString = structFindKey(application.langStruct[#local.thisLang#], arguments.stringToTrans, "one");