[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mthole at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 263f42de995549d19a4f32f2ae387f60161e67c9
Author: mthole at apple.com <mthole at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 20:04:14 2010 +0000

    Title for images should use localized numerals
    https://bugs.webkit.org/show_bug.cgi?id=49017
    
    Reviewed by Dan Bernstein.
    
    WebKit:
    
    * English.lproj/Localizable.strings: Updated.
    
    WebKit/mac:
    
    * WebCoreSupport/WebPlatformStrategies.mm:
    (WebPlatformStrategies::imageTitle): Use localized numerals on Snow Leopard or newer.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71353 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9a6a950..c7a04d8 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-04  Mike Thole  <mthole at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Title for images should use localized numerals
+        https://bugs.webkit.org/show_bug.cgi?id=49017
+
+        * English.lproj/Localizable.strings: Updated.
+
 2010-10-28  Mark Rowe  <mrowe at apple.com>
 
         Stop allowing deprecated methods to be used in NetscapePluginHostProxy.mm now
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 3d09f86..9e9018b 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 4a8a885..7f676e4 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-04  Mike Thole  <mthole at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Title for images should use localized numerals
+        https://bugs.webkit.org/show_bug.cgi?id=49017
+
+        * WebCoreSupport/WebPlatformStrategies.mm:
+        (WebPlatformStrategies::imageTitle): Use localized numerals on Snow Leopard or newer.
+
 2010-11-02  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
index 9d8fd11..f95594a 100644
--- a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
+++ b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
@@ -660,7 +660,13 @@ String WebPlatformStrategies::unknownFileSizeText()
 
 String WebPlatformStrategies::imageTitle(const String& filename, const IntSize& size)
 {
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+    NSString *widthString = [NSNumberFormatter localizedStringFromNumber:[NSNumber numberWithInt:size.width()] numberStyle:NSNumberFormatterDecimalStyle];
+    NSString *heightString = [NSNumberFormatter localizedStringFromNumber:[NSNumber numberWithInt:size.height()] numberStyle:NSNumberFormatterDecimalStyle];
+    return [NSString localizedStringWithFormat:UI_STRING("%@ %@×%@ pixels", "window title for a standalone image (uses multiplication symbol, not x)"), (NSString *)filename, widthString, heightString];
+#else
     return [NSString stringWithFormat:UI_STRING("%@ %d×%d pixels", "window title for a standalone image (uses multiplication symbol, not x)"), (NSString *)filename, size.width(), size.height()];
+#endif
 }
 
 String WebPlatformStrategies::mediaElementLoadingStateText()

-- 
WebKit Debian packaging