Changeset 155:08f1f0a4dd9a

Timestamp:

05/05/12 12:16:30 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Enhanced language handling to run the program in the proper environment for gettext

Files:

• runmlx.bat (modified) (1 diff)
• src/mlx/config.py (modified) (1 diff)
• src/mlx/i18n.py (modified) (1 diff)
• src/mlx/mlx.py (modified) (4 diffs)

runmlx.bat

@@ -5 +5 @@
 set PYTHONPATH=%scriptdir%\src;%PYTHONPATH%
 
-python.exe -m runmlx
+python.exe -m runmlx %1 %2 %3 %4 %5 %6 %7 %8 %9

src/mlx/config.py

@@ -345 +345 @@
         """Get the option name for the given message type level."""
         return const.messageType2string(messageType)
-        
+
+    def setupLocale(self):
+        """Setup the locale based on the language set.
+
+        Return True if a specific language was set, False otherwise."""
+        import locale
+        if self._language:
+            print "Setting up locale for", self._language
+            os.environ["LANGUAGE"] = self._language
+            langAndEncoding = self._language + "." + locale.getpreferredencoding()
+            print langAndEncoding
+            os.environ["LANG"] = langAndEncoding
+            os.environ["LC_MESSAGES"] = langAndEncoding
+            os.environ["LC_COLLATE"] = langAndEncoding
+            os.environ["LC_CTYPE"] = langAndEncoding
+            return True
+        else:
+            return False
+
     def getLanguage(self):
         """Get the language to be used."""

src/mlx/i18n.py

@@ -1 +1 @@
 # Internationalization support
 # -*- coding: utf-8 -*-
+
+#------------------------------------------------------------------------------
+
+import locale
 
 #------------------------------------------------------------------------------

src/mlx/mlx.py

@@ -7 +7 @@
 import os
 import sys
-
-if os.name=="nt":
-    import win32api
 
 #--------------------------------------------------------------------------------------
@@ -25 +22 @@
 #--------------------------------------------------------------------------------------
 
+def restart(args = []):
+    """Restart the program with the given arguments."""
+    print "Restarting with args", args
+    programPath = os.path.join(os.path.dirname(sys.argv[0]),
+                               "runmlx.exe" if os.name=="nt" else "runmlx.sh")
+    if os.name=="nt":
+        import win32api
+        try:
+            programPath = win32api.GetShortPathName(programPath)
+        except:
+            programPath = os.path.join(os.path.dirname(sys.argv[0]),
+                                       "runmlx.bat")
+            programPath = win32api.GetShortPathName(programPath)
+
+    args = [programPath] + args
+
+    os.execv(programPath, args)    
+
+#--------------------------------------------------------------------------------------
+
 def main():
     """The main operation of the program."""
@@ -31 +48 @@
     config = Config()
     config.load()
+
+    if (len(sys.argv)<=1 or sys.argv[1]!="usedeflang") and config.setupLocale():
+        restart(["usedeflang"])
 
     setLanguage(config.getLanguage())
@@ -54 +74 @@
 
     if gui.toRestart:
-        programPath = os.path.join(os.path.dirname(sys.argv[0]),
-                                   "runmlx.exe" if os.name=="nt" else "runmlx.sh")
-        if os.name=="nt":
-            programPath = win32api.GetShortPathName(programPath)
-
-        os.execl(programPath, programPath)
+        restart()
 
 #--------------------------------------------------------------------------------------