Changeset 114224 in webkit

Timestamp:

Apr 15, 2012 11:12:05 PM (12 years ago)

Author:

tkent@chromium.org

Message:

WebCore::weekDayShortLabels() for ICU always returns the fallback labels
​https://bugs.webkit.org/show_bug.cgi?id=83991

Reviewed by Hajime Morita.

We need to specfiy 1-based index to udat_getSymbols() with
UDAT_SHORT_WEEKDAYS. Also, udat_countSymbols() with UDAT_SHORT_WEEKDAYS
returns 8.

No new tests because this behavior depends on locale setting.

• platform/text/LocalizedCalendarICU.cpp:

(WebCore::createLabelVector): Add startIndex argument.
(WebCore::createMonthLabels):
Pass UDAT_JANUARRY(0) as startIndex to createLabelVector().
(WebCore::createWeekDayShortLabels):
Pass UDAT_SUNDAY(1) as startIndex to createLabelVector().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/LocalizedCalendarICU.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-15  Kent Tamura  <tkent@chromium.org>
+
+        WebCore::weekDayShortLabels() for ICU always returns the fallback labels
+        https://bugs.webkit.org/show_bug.cgi?id=83991
+
+        Reviewed by Hajime Morita.
+
+        We need to specfiy 1-based index to udat_getSymbols() with
+        UDAT_SHORT_WEEKDAYS. Also, udat_countSymbols() with UDAT_SHORT_WEEKDAYS
+        returns 8.
+
+        No new tests because this behavior depends on locale setting.
+
+        * platform/text/LocalizedCalendarICU.cpp:
+        (WebCore::createLabelVector): Add startIndex argument.
+        (WebCore::createMonthLabels):
+        Pass UDAT_JANUARRY(0) as startIndex to createLabelVector().
+        (WebCore::createWeekDayShortLabels):
+        Pass UDAT_SUNDAY(1) as startIndex to createLabelVector().
+
 2012-04-15  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/platform/text/LocalizedCalendarICU.cpp

@@ -80 +80 @@
 }
 
-static PassOwnPtr<Vector<String> > createLabelVector(UDateFormatSymbolType type, int32_t size)
+static PassOwnPtr<Vector<String> > createLabelVector(UDateFormatSymbolType type, int32_t startIndex, int32_t size)
 {
     ScopedDateFormat dateFormat;
     if (!dateFormat.get())
         return PassOwnPtr<Vector<String> >();
-    if (udat_countSymbols(dateFormat.get(), type) != size)
+    if (udat_countSymbols(dateFormat.get(), type) != startIndex + size)
         return PassOwnPtr<Vector<String> >();
 
@@ -92 +92 @@
     for (int32_t i = 0; i < size; ++i) {
         UErrorCode status = U_ZERO_ERROR;
-        int32_t length = udat_getSymbols(dateFormat.get(), type, i, 0, 0, &status);
+        int32_t length = udat_getSymbols(dateFormat.get(), type, startIndex + i, 0, 0, &status);
         if (status != U_BUFFER_OVERFLOW_ERROR)
             return PassOwnPtr<Vector<String> >();
         Vector<UChar> buffer(length);
         status = U_ZERO_ERROR;
-        udat_getSymbols(dateFormat.get(), type, i, buffer.data(), length, &status);
+        udat_getSymbols(dateFormat.get(), type, startIndex + i, buffer.data(), length, &status);
         if (U_FAILURE(status))
             return PassOwnPtr<Vector<String> >();
@@ -107 +107 @@
 static PassOwnPtr<Vector<String> > createMonthLabels()
 {
-    OwnPtr<Vector<String> > labels = createLabelVector(UDAT_MONTHS, 12);
+    OwnPtr<Vector<String> > labels = createLabelVector(UDAT_MONTHS, UCAL_JANUARY, 12);
     return labels ? labels.release() : createFallbackMonthLabels();
 }
@@ -133 +133 @@
 static PassOwnPtr<Vector<String> > createWeekDayShortLabels()
 {
-    OwnPtr<Vector<String> > labels = createLabelVector(UDAT_SHORT_WEEKDAYS, 7);
+    OwnPtr<Vector<String> > labels = createLabelVector(UDAT_SHORT_WEEKDAYS, UCAL_SUNDAY, 7);
     return labels ? labels.release() : createFallbackWeekDayShortLabels();
 }