use LC_ALL

abcdesktopio · Oct 14, 2023 · ddb9dc5 · ddb9dc5
1 parent 7326528
commit ddb9dc5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/oc/od/composer.py b/oc/od/composer.py
@@ -529,19 +529,19 @@ def createExecuteEnvironment(authinfo, userinfo, app=None ):
     lang = locale + '.UTF-8'
 
     # update env with user local values read from the http request
-    env.update (    {   'LANGUAGE' : language,                
-                        'LANG'	   : lang,                
-                        'LC_ALL'   : lang,                  
-                        'LC_PAPER' : lang,
-                        'LC_ADDRESS' : lang,                
-                        'LC_MONETARY': lang,                
-                        'LC_TIME': lang,                 
-                        'LC_MEASUREMENT': lang,
-                        'LC_IDENTIFICATION': lang,             
-                        'LC_TELEPHONE': lang,               
-                        'LC_NUMERIC': lang }
-    )
-                    
+    # LC_ALL is the environment variable that overrides all the other localisation settings 
+    # (except $LANGUAGE under some circumstances).
+    # no need to set 
+    # 'LC_PAPER' : lang,
+    # 'LC_ADDRESS' : lang,                
+    # 'LC_MONETARY': lang,                
+    # 'LC_TIME': lang,                 
+    # 'LC_MEASUREMENT': lang,
+    # 'LC_IDENTIFICATION': lang,             
+    # 'LC_TELEPHONE': lang,               
+    # 'LC_NUMERIC': lang }
+    env.update ( { 'LANGUAGE': language, 'LANG': lang, 'LC_ALL': lang } )
+
     # # add dbussession is set in config file
     # if oc.od.settings.desktop['usedbussession']  :
     #     env.update( {'OD_DBUS_SESSION_BUS': str(oc.od.settings.desktop['usedbussession']) })

diff --git a/oc/od/orchestrator.py b/oc/od/orchestrator.py
@@ -3894,21 +3894,18 @@ def get_env_for_appinstance(self, myDesktop, app, authinfo, userinfo={}, userarg
         # read locale language from USER AGENT
         language = userinfo.get('locale', 'en_US')
         lang     = language + '.UTF-8'
+        # LC_ALL is the environment variable that overrides all the other localisation settings 
+        # (except $LANGUAGE under some circumstances).
         env['LANGUAGE']=language
         env['LANG']=lang
         env['LC_ALL']=lang
-        env['LC_PAPER']=lang
-        env['LC_ADDRESS']=lang
-        env['LC_MONETARY']=lang
-        env['LC_TIME']=lang
-        env['LC_MEASUREMENT']=lang
-        env['LC_TELEPHONE']=lang
-        env['LC_NUMERIC']=lang
-        env['LC_IDENTIFICATION']=lang
+
+        # add PARENT_ID PARENT_HOSTNAME for ocrun nodejs script 
         env['PARENT_ID']=myDesktop.id
         env['PARENT_HOSTNAME']=myDesktop.nodehostname
-        env['APP'] = app.get('path')
 
+        # update env APP to run command in /composer/apply-docker-entrypoint.sh
+        env['APP'] = app.get('path')
         # Add specific vars
         if isinstance( kwargs, dict ):
             timezone = kwargs.get('timezone')
@@ -3921,7 +3918,6 @@ def get_env_for_appinstance(self, myDesktop, app, authinfo, userinfo={}, userarg
         if hasattr(authinfo, 'data') and isinstance( authinfo.data, dict ):
             env.update(authinfo.data.get('identity', {}))
 
-
         # convert env dictionnary to env list format for kubernetes
         envlist = ODOrchestratorKubernetes.envdict_to_kuberneteslist( env )
         ODOrchestratorKubernetes.appendkubernetesfieldref( envlist )