Changeset 25114 in vbox for trunk/src/VBox

Timestamp:

Nov 30, 2009 4:25:33 PM (15 years ago)

Author:

vboxsync

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

55484

Message:

FE/Qt4-NLS: Add an English translation file for the plural forms

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxUI.pro (modified) (1 diff)
• nls/ApprovedLanguages.kmk (modified) (2 diffs)
• nls/VirtualBox_en.ts (added)
• nls/qt_en.ts (added)
• src/VBoxGLSettingsLanguage.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -635 +635 @@
 VirtualBox.lproj_INST = $(INST_VIRTUALBOX)Contents/Resources/
 VirtualBox.lproj_MODE = 755
-VirtualBox.lproj_DIRS := $(addsuffix .lproj,$(VBOX_APPROVED_GUI_LANGUAGES_ALL))
+VirtualBox.lproj_DIRS := $(addsuffix .lproj,$(VBOX_APPROVED_GUI_LANGUAGES))
 
 #
@@ -742 +742 @@
 # languages and should never be actually translated or installed.
 #
-updatenls:: \
+updatenls:: makeallnls nls/VirtualBox_en.ts
+
+makeallnls:: \
                 $(filter-out %.qrc,$(VirtualBox_SOURCES) $(VirtualBox_VBOX_EXTRA_NLS_SOURCES)) \
                 $(wildcard include/*.h)
@@ -749 +751 @@
                 $^ \
                 -ts \
-                $(filter-out nls/qt_%.ts,$(VirtualBox_QT_TRANSLATIONS)) \
+                $(filter-out nls/VirtualBox_en.ts,$(filter-out nls/qt_%.ts,$(VirtualBox_QT_TRANSLATIONS))) \
                 nls/VirtualBox_xx_YY.ts
 
+# Create the English translation file. This is something special cause it will
+# contain the plural forms only.
+nls/VirtualBox_en.ts: \
+                $(filter-out %.qrc,$(VirtualBox_SOURCES) $(VirtualBox_VBOX_EXTRA_NLS_SOURCES)) \
+                $(wildcard include/*.h)
+        $(call MSG_L1,lupdate $@)
+        $(QUIET)$(TOOL_QT4_LUPDATE) \
+                $^ \
+                -ts \
+                $@
+        $(QUIET)$(SED) -n -i -e \
+                '/<context>/,/<\/context>/!p;/<context>/h;/<name>/H;/<message numerus="yes">/,/<\/message>/H;/<\/context>/{H;x;/<message/p}' \
+        $@
+

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -62 +62 @@
 
 TRANSLATIONS = \
+        nls/VirtualBox_en.ts \
         nls/VirtualBox_el.ts \
         nls/VirtualBox_tr.ts \

trunk/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk

@@ -20 +20 @@
 #
 
-# The list of approved GUI languages without 'en' (English).
+# The list of approved GUI languages.
 VBOX_APPROVED_GUI_LANGUAGES := \
+        en \
         de    \
         zh_TW \
@@ -51 +52 @@
         da
 
-# The list of approved GUI languages including the default 'en'.
-VBOX_APPROVED_GUI_LANGUAGES_ALL := en $(VBOX_APPROVED_GUI_LANGUAGES)
-

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

@@ -241 +241 @@
             continue;
 
+        /* Skip any English version, cause this is extra handled. */
+        QString lang = regExp.cap (2);
+        if (lang.toLower() == "en")
+            continue;
+
         bool loadOk = translator.load (fileName, nlsPath);
         if (!loadOk)

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

@@ -2942 +2942 @@
     QString selectedLangId = gVBoxBuiltInLangName;
 
+    /* If C is selected we change it temporary to en. This makes sure any extra
+     * "en" translation file will be loaded. This is necessary for loading the
+     * plural forms of some of our translations. */
+    bool fResetToC = false;
+    if (langId == "C")
+    {
+        langId = "en";
+        fResetToC = true;
+    }
+
     char szNlsPath[RTPATH_MAX];
     int rc;
@@ -2978 +2988 @@
              * case, if no explicit language file exists, we will simply
              * fall-back to English (built-in). */
-            if (!aLangId.isNull())
+            if (!aLangId.isNull() && langId != "en")
                 vboxProblem().cannotFindLanguage (langId, nlsPath);
             /* selectedLangId remains built-in here */
@@ -3049 +3059 @@
         if (qtTr && (loadOk = qtTr->load (languageFileName)))
             qApp->installTranslator (qtTr);
-        /* The below message doesn't fit 100% (because it's an additonal
+        /* The below message doesn't fit 100% (because it's an additional
          * language and the main one won't be reset to built-in on failure)
          * but the load failure is so rare here that it's not worth a separate
@@ -3056 +3066 @@
             vboxProblem().cannotLoadLanguage (languageFileName);
     }
+    if (fResetToC)
+        sLoadedLangId = "C";
 }