Changeset 155:08f1f0a4dd9a for src/mlx/mlx.py

Timestamp:

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

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

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

File:

• src/mlx/mlx.py (modified) (4 diffs)

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()
 
 #--------------------------------------------------------------------------------------