Changeset 25123 in vbox

Timestamp:

Dec 1, 2009 9:26:49 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Consolidate the plural handling of time values a little bit.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• nls/VirtualBox_en.ts (modified) (4 diffs)
• src/VBoxProgressDialog.cpp (modified) (1 diff)
• src/VBoxSnapshotsWgt.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -344 +344 @@
         AssertMsg (pm, ("Icon for VM state %d must be defined", s));
         return pm ? *pm : QPixmap();
+    }
+
+    static inline QString yearsToString (uint32_t cVal)
+    {
+        return tr("%n year(s)", "", cVal);
+    }
+
+    static inline QString monthsToString (uint32_t cVal)
+    {
+        return tr("%n month(s)", "", cVal);
+    }
+
+    static inline QString daysToString (uint32_t cVal)
+    {
+        return tr("%n day(s)", "", cVal);
+    }
+
+    static inline QString hoursToString (uint32_t cVal)
+    {
+        return tr("%n hours(s)", "", cVal);
+    }
+
+    static inline QString minutesToString (uint32_t cVal)
+    {
+        return tr("%n minute(s)", "", cVal);
+    }
+
+    static inline QString secondsToString (uint32_t cVal)
+    {
+        return tr("%n seconds(s)", "", cVal);
     }
 

trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts

@@ -3 +3 @@
 <TS version="2.0" language="en">
 <context>
-    <name>VBoxProgressDialog</name>
+    <name>VBoxGlobal</name>
     <message numerus="yes">
-        <location filename="../src/VBoxProgressDialog.cpp" line="211"/>
+        <location filename="../include/VBoxGlobal.h" line="350"/>
+        <source>%n year(s)</source>
+        <translation>
+            <numerusform>%n year</numerusform>
+            <numerusform>%n years</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../include/VBoxGlobal.h" line="355"/>
+        <source>%n month(s)</source>
+        <translation>
+            <numerusform>%n month</numerusform>
+            <numerusform>%n months</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../include/VBoxGlobal.h" line="360"/>
         <source>%n day(s)</source>
         <translation>
@@ -13 +29 @@
     </message>
     <message numerus="yes">
-        <location filename="../src/VBoxProgressDialog.cpp" line="212"/>
-        <source>%n hour(s)</source>
+        <location filename="../include/VBoxGlobal.h" line="365"/>
+        <source>%n hours(s)</source>
         <translation>
             <numerusform>%n hour</numerusform>
@@ -21 +37 @@
     </message>
     <message numerus="yes">
-        <location filename="../src/VBoxProgressDialog.cpp" line="213"/>
+        <location filename="../include/VBoxGlobal.h" line="370"/>
         <source>%n minute(s)</source>
         <translation>
@@ -29 +45 @@
     </message>
     <message numerus="yes">
-        <location filename="../src/VBoxProgressDialog.cpp" line="214"/>
-        <source>%n second(s)</source>
+        <location filename="../include/VBoxGlobal.h" line="375"/>
+        <source>%n seconds(s)</source>
         <translation>
             <numerusform>%n second</numerusform>
             <numerusform>%n seconds</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>VBoxSnapshotsWgt</name>
-    <message numerus="yes">
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="189"/>
-        <source> (%n day(s) ago)</source>
-        <translation>
-            <numerusform> (%n day ago)</numerusform>
-            <numerusform> (%n days ago)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="194"/>
-        <source> (%n hour(s) ago)</source>
-        <translation>
-            <numerusform> (%n hour ago)</numerusform>
-            <numerusform> (%n hours ago)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="199"/>
-        <source> (%n minute(s) ago)</source>
-        <translation>
-            <numerusform> (%n minute ago)</numerusform>
-            <numerusform> (%n minutes ago)</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <location filename="../src/VBoxSnapshotsWgt.cpp" line="204"/>
-        <source> (%n second(s) ago)</source>
-        <translation>
-            <numerusform> (%n second ago)</numerusform>
-            <numerusform> (%n seconds ago)</numerusform>
         </translation>
     </message>

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

@@ -209 +209 @@
         int seconds = time.addDays (-days).time().second();
 
-        QString strDays = tr ("%n day(s)", "", days);
-        QString strHours = tr ("%n hour(s)", "", hours);
-        QString strMinutes = tr ("%n minute(s)", "", minutes);
-        QString strSeconds = tr ("%n second(s)", "", seconds);
+        QString strDays = VBoxGlobal::daysToString(days);
+        QString strHours = VBoxGlobal::hoursToString(hours);
+        QString strMinutes = VBoxGlobal::minutesToString(minutes);
+        QString strSeconds = VBoxGlobal::secondsToString(seconds);
 
         QString strTwoComp = tr ("%1, %2 remaining");

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

@@ -187 +187 @@
         else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60 * 60 * 24)
         {
-            age = VBoxSnapshotsWgt::tr (" (%n day(s) ago)", "", mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60 / 24);
+            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::daysToString(mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60 / 24));
             ageFormat = AgeInDays;
         }
         else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60 * 60)
         {
-            age = VBoxSnapshotsWgt::tr (" (%n hour(s) ago)", "", mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60);
+            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::hoursToString(mTimestamp.secsTo (QDateTime::currentDateTime()) / 60 / 60));
             ageFormat = AgeInHours;
         }
         else if (mTimestamp.secsTo (QDateTime::currentDateTime()) > 60)
         {
-            age = VBoxSnapshotsWgt::tr (" (%n minute(s) ago)", "", mTimestamp.secsTo (QDateTime::currentDateTime()) / 60);
+            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::minutesToString(mTimestamp.secsTo (QDateTime::currentDateTime()) / 60));
             ageFormat = AgeInMinutes;
         }
         else
         {
-            age = VBoxSnapshotsWgt::tr (" (%n second(s) ago)", "", mTimestamp.secsTo (QDateTime::currentDateTime()));
+            age = VBoxSnapshotsWgt::tr (" (%1 ago)").arg(VBoxGlobal::secondsToString(mTimestamp.secsTo (QDateTime::currentDateTime())));
             ageFormat = AgeInSeconds;
         }