Changeset 2158 in vbox

Timestamp:

Apr 18, 2007 11:23:14 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

20487

Message:

FE/Qt: Fixed assertion and an invalid error message when starting VirtualBox in the C locale.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobal.cpp (modified) (6 diffs)
• VMGlobalSettings.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1827 +1827 @@
 extern const char *gVBoxLangFileBase = "VirtualBox_";
 extern const char *gVBoxLangFileExt = ".qm";
-extern const char *gVBoxLangIDRegExp = "(([a-z]{2})(?:_([A-Z]{2}))?)";
-extern const char *gVBoxBuiltInLangName   = "built_in";
+extern const char *gVBoxLangIDRegExp = "(([a-z]{2})(?:_([A-Z]{2}))?)|(C)";
+extern const char *gVBoxBuiltInLangName   = "C";
 
 class VBoxTranslator : public QTranslator
@@ -1858 +1858 @@
  *  Note that it may not match with VMGlobalSettings::languageId() if the
  *  specified language cannot be loaded.
- *  If the built-in language is active, this method returns "built_in".
+ *  If the built-in language is active, this method returns "C".
+ *
+ *  @note "C" is treated as the built-in language for simplicity -- the C
+ *  locale is used in unix environments as a fallback when the requested
+ *  locale is invalid. This way we don't need to process both the "built_in"
+ *  language and the "C" language (which is a valid environment setting)
+ *  separately.
  */
 /* static */
@@ -1880 +1886 @@
     QString selectedLangId = gVBoxBuiltInLangName;
 
-    if (!aLangId.isNull() && aLangId != gVBoxBuiltInLangName)
+    Assert (!langId.isEmpty());
+    if (!langId.isEmpty() && langId != gVBoxBuiltInLangName)
     {
         QRegExp regExp (gVBoxLangIDRegExp);
-        int rule = regExp.search (langId);
-        /* this rule should match the language id completely */
-        AssertReturnVoid (rule == 0);
+        int pos = regExp.search (langId);
+        /* the language ID should match the regexp completely */
+        AssertReturnVoid (pos == 0);
 
         QString lang = regExp.cap (2);
@@ -1903 +1910 @@
             selectedLangId = lang;
         }
-
-        if (languageFileName.isNull())
-        {
-            vboxProblem().cannotFindLanguage (langId, nlsPath);
-            return;
+        else
+        {
+            /* Never complain when the default language is requested.  In any
+             * case, if no explicit language file exists, we will simply
+             * fall-back to English (built-in). */
+            if (!aLangId.isNull())
+                vboxProblem().cannotFindLanguage (langId, nlsPath);
+            /* selectedLangId remains built-in here */
+            AssertReturnVoid (selectedLangId == gVBoxBuiltInLangName);
         }
     }
@@ -1928 +1939 @@
         }
         /* we install the translator in any case: on failure, this will
-         * activate an empty (aka built-in) translator */
+         * activate an empty translator that will give us English
+         * (built-in) */
         qApp->installTranslator (sTranslator);
     }
@@ -2379 +2391 @@
  *  The order of precedence is well defined here:
  *  http://opengroup.org/onlinepubs/007908799/xbd/envvar.html
+ *
+ *  @note This method will return "C" when the requested locale is invalid or
+ *  when the "C" locale is set explicitly.
  */
 /* static */

trunk/src/VBox/Frontends/VirtualBox/src/VMGlobalSettings.cpp

@@ -86 +86 @@
  */
 
+/* Defined in VBoxGlobal.cpp */
+extern const char *gVBoxLangIDRegExp;
+
 static struct
 {
@@ -98 +101 @@
     { "GUI/Input/AutoCapture",  "autoCapture",  "true|false", true },
     { "GUI/Customizations",     "guiFeatures",  "\\S+", true },
-    /* LanguageID regexp must correlate with gVBoxLangIDRegExp in
-     * VBoxGlobal.cpp */
-    { "GUI/LanguageID",         "languageId",   "(([a-z]{2})(_([A-Z]{2}))?)|(built_in)", true },
+    { "GUI/LanguageID",         "languageId",   gVBoxLangIDRegExp, true },
 };