Changeset 74306 in webkit

Timestamp:

Dec 17, 2010 5:42:54 PM (13 years ago)

Author:

Darin Adler

Message:

2010-12-17 Darin Adler <Darin Adler>

Reviewed by Dan Bernstein.

Window title for image documents shows corrupted characters instead of multiplication sign when using WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=43505

• WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Changed UI_STRING macros to return WebCore::String objects instead of C strings. (WebKit::formatLocalizedString): Added. Uses the Core Foundation string formatting function for reasons explained in the comment. (WebKit::WebPlatformStrategies::multipleFileUploadText): Use formatLocalizedString instead of String::format. (WebKit::WebPlatformStrategies::imageTitle): Ditto. (WebKit::WebPlatformStrategies::localizedMediaTimeDescription): Ditto.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (modified) (4 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-17  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Window title for image documents shows corrupted characters instead of multiplication sign when using WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=43505
+
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Changed UI_STRING macros to return
+        WebCore::String objects instead of C strings.
+        (WebKit::formatLocalizedString): Added. Uses the Core Foundation string formatting function for
+        reasons explained in the comment.
+        (WebKit::WebPlatformStrategies::multipleFileUploadText): Use formatLocalizedString instead of
+        String::format.
+        (WebKit::WebPlatformStrategies::imageTitle): Ditto.
+        (WebKit::WebPlatformStrategies::localizedMediaTimeDescription): Ditto.
+
 2010-12-17  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

@@ -39 +39 @@
 
 // FIXME: Implement localization.
-#define UI_STRING(string, description) string
-#define UI_STRING_KEY(string, key, description) string
+#define UI_STRING(string, description) String::fromUTF8(string, strlen(string))
+#define UI_STRING_KEY(string, key, description) String::fromUTF8(string, strlen(string))
 
 using namespace WebCore;
 
 namespace WebKit {
+
+// We can't use String::format for two reasons:
+//  1) It doesn't handle non-ASCII characters in the format string.
+//  2) It doesn't handle the %2$d syntax.
+static String formatLocalizedString(const String& format, ...)
+{
+#if PLATFORM(CF)
+    va_list arguments;
+    va_start(arguments, format);
+    RetainPtr<CFStringRef> formatCFString(AdoptCF, format.createCFString());
+    RetainPtr<CFStringRef> result(AdoptCF, CFStringCreateWithFormatAndArguments(0, 0, formatCFString.get(), arguments));
+    va_end(arguments);
+    return result.get();
+#else
+    notImplemented();
+    return format;
+#endif
+}
 
 void WebPlatformStrategies::initialize()
@@ -680 +698 @@
 String WebPlatformStrategies::multipleFileUploadText(unsigned numberOfFiles)
 {
-    return String::format(UI_STRING("%d files", "Label to describe the number of files selected in a file upload control that allows multiple files"), numberOfFiles);
+    return formatLocalizedString(UI_STRING("%d files", "Label to describe the number of files selected in a file upload control that allows multiple files"), numberOfFiles);
 }
 
@@ -706 +724 @@
 String WebPlatformStrategies::imageTitle(const String& filename, const IntSize& size)
 {
-    return String::format(UI_STRING("%s %d×%d pixels", "window title for a standalone image (uses multiplication symbol, not x)"), filename.utf8().data(), size.width(), size.height());
+    // FIXME: It would be nice to have the filename inside the format string, but it's not easy to do that in a way that works with non-ASCII characters in the filename.
+    return filename + formatLocalizedString(UI_STRING(" %d×%d pixels", "window title suffix for a standalone image (uses multiplication symbol, not x)"), size.width(), size.height());
 }
 
@@ -821 +840 @@
 
     if (days)
-        return String::format(UI_STRING("%1$d days %2$d hours %3$d minutes %4$d seconds", "accessibility help text for media controller time value >= 1 day"), days, hours, minutes, seconds);
+        return formatLocalizedString(UI_STRING("%1$d days %2$d hours %3$d minutes %4$d seconds", "accessibility help text for media controller time value >= 1 day"), days, hours, minutes, seconds);
     if (hours)
-        return String::format(UI_STRING("%1$d hours %2$d minutes %3$d seconds", "accessibility help text for media controller time value >= 60 minutes"), hours, minutes, seconds);
+        return formatLocalizedString(UI_STRING("%1$d hours %2$d minutes %3$d seconds", "accessibility help text for media controller time value >= 60 minutes"), hours, minutes, seconds);
     if (minutes)
-        return String::format(UI_STRING("%1$d minutes %2$d seconds", "accessibility help text for media controller time value >= 60 seconds"), minutes, seconds);
-    return String::format(UI_STRING("%1$d seconds", "accessibility help text for media controller time value < 60 seconds"), seconds);
+        return formatLocalizedString(UI_STRING("%1$d minutes %2$d seconds", "accessibility help text for media controller time value >= 60 seconds"), minutes, seconds);
+    return formatLocalizedString(UI_STRING("%1$d seconds", "accessibility help text for media controller time value < 60 seconds"), seconds);
 }