FIX: Error on linux2 when running from source and bin, and there is a new language in the source

tatiana
1 parent abb3cdf4
Showing 2 changed files with 16 additions and 7 deletions Show diff stats
invesalius/i18n.py
invesalius/invesalius.py
@@ -64,8 +64,11 @@ def GetLocaleOS():
 def InstallLanguage(language):
     language_dir = os.path.abspath(os.path.join('..','locale'))
-    lang = gettext.translation('invesalius', language_dir,\
+    if os.path.isdir(language_dir):
+        lang = gettext.translation('invesalius', language_dir,\
                                    languages=[language], codeset='utf8')
-    # Using unicode
-    lang.install(unicode=1)
-    return lang.ugettext
+        # Using unicode
+        lang.install(unicode=1)
+        return lang.ugettext
+    else:
+        return False
@@ -90,13 +90,19 @@ class SplashScreen(_SplashScreen):
             create_session = True
         # Check if there is a language set (if session file exists
-        if session.ReadLanguage():
+        language_exist = session.ReadLanguage()
+
+        if language_exist:
             lang = session.GetLanguage()
-            _ = i18n.InstallLanguage(lang)
+            install = i18n.InstallLanguage(lang)
+            if install:
+                _ = install
+            else:
+    		    language_exist = False
         # If no language is set into session file, show dialog so
         # user can select language
-        else:
+        if not language_exist:
             dialog = lang_dlg.LanguageDialog()
             # FIXME: This works ok in linux2, darwin and win32,