Changeset 107288 in webkit

Timestamp:

Feb 9, 2012, 1:47:58 PM (15 years ago)

Author:

benjamin@webkit.org

Message:

The localization of htmlSelectMultipleItems() needs better support of pluralization
​https://bugs.webkit.org/show_bug.cgi?id=78197

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2012-02-09
Reviewed by Joseph Pecoraro.

For translation, the localization of 0 and 1 depends on the language.

• English.lproj/Localizable.strings:
• platform/DefaultLocalizationStrategy.cpp:

(WebCore::DefaultLocalizationStrategy::htmlSelectMultipleItems):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/Localizable.strings (modified) (1 diff)
• platform/DefaultLocalizationStrategy.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-09  Benjamin Poulain  <bpoulain@apple.com>
+
+        The localization of htmlSelectMultipleItems() needs better support of pluralization
+        https://bugs.webkit.org/show_bug.cgi?id=78197
+
+        Reviewed by Joseph Pecoraro.
+
+        For translation, the localization of 0 and 1 depends on the language.
+
+        * English.lproj/Localizable.strings:
+        * platform/DefaultLocalizationStrategy.cpp:
+        (WebCore::DefaultLocalizationStrategy::htmlSelectMultipleItems):
+
 2012-02-09  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/English.lproj/Localizable.strings

@@ -26 +26 @@
 "%d files" = "%d files";
 
+/* Present the element <select multiple> when no <option> items are selected (iOS only) */
+"0 Items" = "0 Items";
+
+/* Present the element <select multiple> when a single <option> is selected (iOS only) */
+"1 Item" = "1 Item";
+
+/* Present the number of selected <option> items in a <select multiple> element (iOS only) */
+"%d Items" = "%d Items";
+
 /* Menu item title for KEYGEN pop-up menu */
 "1024 (Medium Grade)" = "1024 (Medium Grade)";

trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp

@@ -771 +771 @@
 String DefaultLocalizationStrategy::htmlSelectMultipleItems(int count)
 {
-    return formatLocalizedString(WEB_UI_STRING("%d Items", "Present the number of selected <option> items in a <select multiple> element (iOS only)"), count);
+    switch (count) {
+    case 0:
+        return WEB_UI_STRING("0 Items", "Present the element <select multiple> when no <option> items are selected (iOS only)");
+    case 1:
+        return WEB_UI_STRING("1 Item", "Present the element <select multiple> when a single <option> is selected (iOS only)");
+    default:
+        return formatLocalizedString(WEB_UI_STRING("%d Items", "Present the number of selected <option> items in a <select multiple> element (iOS only)"), count);
+    }
 }
 #endif // PLATFORM(IOS)