Changeset 125741 in webkit

Timestamp:

Aug 15, 2012, 8:54:03 PM (14 years ago)

Author:

tkent@chromium.org

Message:

Calendar Picker: Localize numbers in a calendar picker
​https://bugs.webkit.org/show_bug.cgi?id=93704

Reviewed by Hajime Morita.

.:

• ManualTests/forms/calendar-picker.html:

Add a mock pagePopupController.localizeNumberString().

Source/WebCore:

Because Number.toLocaleString() of V8 returns no localized
numbers, we provide a localization function via
PagePopupController.

No new tests. We have no ways to change the locale in layout tests.

• Resources/pagepopups/calendarPicker.js:

(localizeNumber): Added. A wrapper for pagePopupController.localizeNumberString().
(formatJapaneseImperialEra): Use localizeNumber().
(formatYearMonth): ditto.
(DaysTable.prototype._renderMonth): ditto.

• page/PagePopupController.cpp:

(WebCore::PagePopupController::localizeNumberString):
Added. Just calls WebCore::convertToLocalizedNumber().

• page/PagePopupController.h:

(PagePopupController): Declare localizeNumberString().

• page/PagePopupController.idl: Add localizeNumberString().

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/forms/calendar-picker.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Resources/pagepopups/calendarPicker.js (modified) (4 diffs)
• Source/WebCore/page/PagePopupController.cpp (modified) (2 diffs)
• Source/WebCore/page/PagePopupController.h (modified) (1 diff)
• Source/WebCore/page/PagePopupController.idl (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-08-15  Kent Tamura  <tkent@chromium.org>
+
+        Calendar Picker: Localize numbers in a calendar picker
+        https://bugs.webkit.org/show_bug.cgi?id=93704
+
+        Reviewed by Hajime Morita.
+
+        * ManualTests/forms/calendar-picker.html:
+        Add a mock pagePopupController.localizeNumberString().
+
 2012-08-15  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/ManualTests/forms/calendar-picker.html

@@ -94 +94 @@
             if (numValue == 0)
                 window.document.getElementById('date').value = stringValue;
+        },
+        localizeNumberString: function(numString) {
+            if (typeof numString == "number")
+                return numString.toLocaleString();
+            return numString.toString();
         }
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-15  Kent Tamura  <tkent@chromium.org>
+
+        Calendar Picker: Localize numbers in a calendar picker
+        https://bugs.webkit.org/show_bug.cgi?id=93704
+
+        Reviewed by Hajime Morita.
+
+        Because Number.toLocaleString() of V8 returns no localized
+        numbers, we provide a localization function via
+        PagePopupController.
+
+        No new tests. We have no ways to change the locale in layout tests.
+
+        * Resources/pagepopups/calendarPicker.js:
+        (localizeNumber): Added. A wrapper for pagePopupController.localizeNumberString().
+        (formatJapaneseImperialEra): Use localizeNumber().
+        (formatYearMonth): ditto.
+        (DaysTable.prototype._renderMonth): ditto.
+        * page/PagePopupController.cpp:
+        (WebCore::PagePopupController::localizeNumberString):
+        Added. Just calls WebCore::convertToLocalizedNumber().
+        * page/PagePopupController.h:
+        (PagePopupController): Declare localizeNumberString().
+        * page/PagePopupController.idl: Add localizeNumberString().
+
 2012-08-15  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/Resources/pagepopups/calendarPicker.js

@@ -98 +98 @@
 }
 
+/**
+ * @param {!number} number
+ * @return {!string}
+ */
+function localizeNumber(number) {
+    return window.pagePopupController.localizeNumberString(number);
+}
+
 /*
  * @const
@@ -115 +123 @@
         return "";
     if (year > 1989)
-        return "(平成" + (year - 1988) + "年)";
+        return "(平成" + localizeNumber(year - 1988) + "年)";
     if (year == 1989)
         return "(平成元年)";
     if (year >= 1927)
-        return "(昭和" + (year - 1925) + "年)";
+        return "(昭和" + localizeNumber(year - 1925) + "年)";
     if (year > 1912)
-        return "(大正" + (year - 1911) + "年)";
+        return "(大正" + localizeNumber(year - 1911) + "年)";
     if (year == 1912 && month >= 7)
         return "(大正元年)";
     if (year > 1868)
-        return "(明治" + (year - 1867) + "年)";
+        return "(明治" + localizeNumber(year - 1867) + "年)";
     if (year == 1868)
         return "(明治元年)";
@@ -137 +145 @@
  */
 function formatYearMonth(year, month) {
-    // FIXME: Need localized number?
-    var yearString = String(year);
+    var yearString = localizeNumber(year);
     var monthString = global.params.monthLabels[month];
     switch (getLanguage()) {
@@ -858 +865 @@
             var time = dayIterator.getTime();
             var element = this._days[w][d];
-            // FIXME: Need localized number?
-            element.innerText = String(dayIterator.getUTCDate());
+            element.innerText = localizeNumber(dayIterator.getUTCDate());
             element.className = ClassNames.Day;
             element.dataset.submitValue = serializeDate(iterYear, iterMonth, dayIterator.getUTCDate());

trunk/Source/WebCore/page/PagePopupController.cpp

@@ -33 +33 @@
 
 #if ENABLE(PAGE_POPUP)
+#include "LocalizedNumber.h"
 #include "PagePopupClient.h"
 
@@ -53 +54 @@
 }
 
+String PagePopupController::localizeNumberString(const String& numberString)
+{
+    return convertToLocalizedNumber(numberString);
+}
+
 }
 #endif

trunk/Source/WebCore/page/PagePopupController.h

@@ -45 +45 @@
     static PassRefPtr<PagePopupController> create(PagePopupClient*);
     void setValueAndClosePopup(int numValue, const String& stringValue);
+    String localizeNumberString(const String&);
 
 private:

trunk/Source/WebCore/page/PagePopupController.idl

@@ -34 +34 @@
     ] PagePopupController {
         void setValueAndClosePopup(in long numberValue, in DOMString stringValue);
+        DOMString localizeNumberString(in DOMString numberString);
     };
 }