Changeset 2068 in vbox for trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

Timestamp:

Apr 13, 2007 10:01:20 AM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Added the Default choice for to the language selection UI.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (3 diffs)

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

@@ -1868 +1868 @@
 /**
  *  Loads the language by language ID.
- *  @param aLang language ID in in form of xx_YY
+ *
+ *  @param aLangId Language ID in in form of xx_YY. QString::null means the
+ *                 system default language.
  */
 /* static */
-void VBoxGlobal::loadLanguage (const QString &aLang)
-{
-    QString langId = aLang.isNull() ?
-        VBoxGlobal::systemLanguageId() : aLang;
-    QString languageFileName = QString::null;
+void VBoxGlobal::loadLanguage (const QString &aLangId)
+{
+    QString langId = aLangId.isNull() ?
+        VBoxGlobal::systemLanguageId() : aLangId;
+    QString languageFileName;
     QString selectedLangId = gVBoxBuiltInLangName;
 
-    if (aLang != gVBoxBuiltInLangName)
+    if (!aLangId.isNull() && aLangId != gVBoxBuiltInLangName)
     {
         QRegExp regExp (gVBoxLangIDRegExp);
         int rule = regExp.search (langId);
         /* this rule should match the language id completely */
-        Assert (!rule);
-        if (rule == -1) return;
-
-        QString mId1part = regExp.cap (2);
-        QString mId2part = regExp.cap (4);
-        /* language localization (second part) should not be empty? */
-        // Assert (!mId2part.isEmpty());
+        AssertReturnVoid (rule == 0);
+
+        QString lang = regExp.cap (2);
 
         QString nlsPath = qApp->applicationDirPath() + gVBoxLangSubDir;
@@ -1899 +1897 @@
             selectedLangId = langId;
         }
-        else if (nlsDir.exists (gVBoxLangFileBase + mId1part + gVBoxLangFileExt))
-        {
-            languageFileName = nlsDir.absFilePath (gVBoxLangFileBase + mId1part +
+        else if (nlsDir.exists (gVBoxLangFileBase + lang + gVBoxLangFileExt))
+        {
+            languageFileName = nlsDir.absFilePath (gVBoxLangFileBase + lang +
                                                    gVBoxLangFileExt);
-            selectedLangId = mId1part;
-        }
-
-        if (sTranslator && languageFileName.isNull())
+            selectedLangId = lang;
+        }
+
+        if (languageFileName.isNull())
         {
             vboxProblem().cannotFindLanguage (langId, nlsPath);
@@ -1924 +1922 @@
     if (sTranslator)
     {
-        /* an empty file name means built-in English*/
         if (selectedLangId != gVBoxBuiltInLangName)
         {