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().

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 5d74235c95a106b01be5de03c7846679e8488b9c..4f975c5a78a375e61d5b46b632e87fbb73e71591 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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>
 
         Update manual tests and comments to refer to TestRunner instead of LayoutTestController

diff --git a/ManualTests/forms/calendar-picker.html b/ManualTests/forms/calendar-picker.html
index d212a7878219b39985c965b034f6a658c93b477a..438eb6f6f6850ff42ab19e7ee217d09519476722 100644 (file)
--- a/ManualTests/forms/calendar-picker.html
+++ b/ManualTests/forms/calendar-picker.html
@@ -93,6 +93,11 @@ function openCalendar(args) {
             window.log('number=' + numValue + ', string="' + stringValue + '"');
             if (numValue == 0)
                 window.document.getElementById('date').value = stringValue;
+        },
+        localizeNumberString: function(numString) {
+            if (typeof numString == "number")
+                return numString.toLocaleString();
+            return numString.toString();
         }
     }
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d85203179d2e5cba173dfa17662a12454f87a7ca..607dd695efb6df3cbbe38af13c73be5076f593ec 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+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>
 
         Regression(121518) TextFieldDecorationElement formatting is broken.

diff --git a/Source/WebCore/Resources/pagepopups/calendarPicker.js b/Source/WebCore/Resources/pagepopups/calendarPicker.js
index ccc4b8d0626b4e798e78ad7a55aee4512ef4bc6c..4ace4d3bafc352eb427e8d4f937fe1d8897d36dd 100644 (file)
--- a/Source/WebCore/Resources/pagepopups/calendarPicker.js
+++ b/Source/WebCore/Resources/pagepopups/calendarPicker.js
@@ -97,6 +97,14 @@ function getLanguage() {
     return result[1];
 }
 
+/**
+ * @param {!number} number
+ * @return {!string}
+ */
+function localizeNumber(number) {
+    return window.pagePopupController.localizeNumberString(number);
+}
+
 /*
  * @const
  * @type {number}
@@ -114,17 +122,17 @@ function formatJapaneseImperialEra(year, month) {
     if (year > ImperialEraLimit)
         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 "(明治元年)";
     return "";
@@ -136,8 +144,7 @@ function formatJapaneseImperialEra(year, month) {
  * @return {!string}
  */
 function formatYearMonth(year, month) {
-    // FIXME: Need localized number?
-    var yearString = String(year);
+    var yearString = localizeNumber(year);
     var monthString = global.params.monthLabels[month];
     switch (getLanguage()) {
     case "eu":
@@ -857,8 +864,7 @@ DaysTable.prototype._renderMonth = function(year, month) {
             var iterMonth = dayIterator.getUTCMonth();
             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());
             if (outOfRange(time))

diff --git a/Source/WebCore/page/PagePopupController.cpp b/Source/WebCore/page/PagePopupController.cpp
index 824f6dfaa5a492764752ff97f3f30caa9341500e..8ee36536b0748a9d8ca2a4ca9a74a19188191d88 100644 (file)
--- a/Source/WebCore/page/PagePopupController.cpp
+++ b/Source/WebCore/page/PagePopupController.cpp
@@ -32,6 +32,7 @@
 #include "PagePopupController.h"
 
 #if ENABLE(PAGE_POPUP)
+#include "LocalizedNumber.h"
 #include "PagePopupClient.h"
 
 namespace WebCore {
@@ -52,5 +53,10 @@ void PagePopupController::setValueAndClosePopup(int numValue, const String& stri
     m_popupClient->setValueAndClosePopup(numValue, stringValue);
 }
 
+String PagePopupController::localizeNumberString(const String& numberString)
+{
+    return convertToLocalizedNumber(numberString);
+}
+
 }
 #endif

diff --git a/Source/WebCore/page/PagePopupController.h b/Source/WebCore/page/PagePopupController.h
index 1ec72876659d19a1af242dd88decf0146cb24b0e..d0dd5c164c34f508586faed87a3d965fe1619c73 100644 (file)
--- a/Source/WebCore/page/PagePopupController.h
+++ b/Source/WebCore/page/PagePopupController.h
@@ -44,6 +44,7 @@ class PagePopupController : public RefCounted<PagePopupController> {
 public:
     static PassRefPtr<PagePopupController> create(PagePopupClient*);
     void setValueAndClosePopup(int numValue, const String& stringValue);
+    String localizeNumberString(const String&);
 
 private:
     explicit PagePopupController(PagePopupClient*);

diff --git a/Source/WebCore/page/PagePopupController.idl b/Source/WebCore/page/PagePopupController.idl
index 6e0a49daba1495b301f84ef625498638d9b38990..d0669efe5f8f67e4c09c39ed07684f1e8c2e11c8 100644 (file)
--- a/Source/WebCore/page/PagePopupController.idl
+++ b/Source/WebCore/page/PagePopupController.idl
@@ -33,5 +33,6 @@ module window {
         Conditional=PAGE_POPUP
     ] PagePopupController {
         void setValueAndClosePopup(in long numberValue, in DOMString stringValue);
+        DOMString localizeNumberString(in DOMString numberString);
     };
 }