Monotone-Parent: 7ee997ad520d61e48d2f051e02d433791c47fd08

Monotone-Revision: c37895534ea03712cf65f5760bc535177a041d99

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-04-01T19:43:11
Monotone-Branch: ca.inverse.sogo

Tests/Integration/all.py

@@ -12,10 +12,8 @@ if __name__ == "__main__":
 
     loader = unittest.TestLoader()
     modules = []
-    # Duplicated from UIxPreferences.m
-    languages = ["Czech", "Dutch", "English", "French", 
-                 "German", "Hungarian", "Italian", "BrazilianPortuguese", "Norwegian", 
-                 "Polish", "Russian", "Spanish", "Swedish", "Ukrainian", "Welsh"]
+
+    languages = preferences.SOGoSupportedLanguages
 
     # We can disable testing all languages
     testLanguages = False
@@ -39,15 +37,15 @@ if __name__ == "__main__":
         if testLanguages:
             prefs = preferences.preferences()
             # Get the current language
-            userLanguageString = prefs.get ("Language")
+            userLanguageString = prefs.get ("SOGoLanguage")
             if userLanguageString:
                 userLanguage = languages.index (userLanguageString)
             else:
-                userLanguage = 2
+                userLanguage = languages.index ("English")
 
             for i in range (0, len (languages)):
                 try:
-                    prefs.set ("language", i)
+                    prefs.set ("SOGoLanguage", i)
                 except Exception, inst:
                     print '-' * 60
                     traceback.print_exc ()
@@ -58,7 +56,7 @@ if __name__ == "__main__":
                 runner.verbosity = 2
                 runner.run(suite)
             # Revert to the original language
-            prefs.set ("language", userLanguage)
+            prefs.set ("SOGoLanguage", userLanguage)
         else:
             runner.run(suite)