Fix extract-localizable-strings for macro change from UI_STRING -> WEB_UI_STRING.
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Apr 2011 22:11:13 +0000 (22:11 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Apr 2011 22:11:13 +0000 (22:11 +0000)
Reviewed by Timothy Hatcher.

* Scripts/extract-localizable-strings:

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

Tools/ChangeLog
Tools/Scripts/extract-localizable-strings

index 85c564b..305e820 100644 (file)
@@ -1,3 +1,11 @@
+2011-04-01  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Fix extract-localizable-strings for macro change from UI_STRING -> WEB_UI_STRING.
+
+        * Scripts/extract-localizable-strings:
+
 2011-02-09  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam Weinig.
@@ -16,7 +24,6 @@
         * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj:
         * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
 
-<<<<<<< .mine
 2011-04-01  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam Weinig.
@@ -44,7 +51,6 @@
         (ConvertPoint::testConvert):
         (ConvertPoint::NPP_New):
 
-=======
 2011-04-01  Dominic Cooney  <dominicc@google.com>
 
         Reviewed by Martin Robinson.
@@ -55,7 +61,6 @@
         * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
         (LayoutTestController::shadowRoot):
 
->>>>>>> .r82722
 2011-04-01  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Anders Carlsson.
index 116f11f..759b5fa 100755 (executable)
@@ -169,7 +169,7 @@ handleString:
                         # FIXME: Validate UTF-8 here?
                         $UIString = $string;
                         $expected = ",";
-                    } elsif (($macro =~ /UI_STRING_KEY(_INTERNAL)?$/) and !defined $key) {
+                    } elsif (($macro =~ /(WEB_)?UI_STRING_KEY(_INTERNAL)?$/) and !defined $key) {
                         # FIXME: Validate UTF-8 here?
                         $key = $string;
                         $expected = ",";
@@ -228,7 +228,7 @@ handleString:
                     $sawError = 1;
                     $expected = "";
                 }
-                if ($token =~ /UI_STRING(_KEY)?(_INTERNAL)?$/) {
+                if ($token =~ /(WEB_)?UI_STRING(_KEY)?(_INTERNAL)?$/) {
                     $expected = "(";
                     $macro = $token;
                     $UIString = undef;