Title: [154117] trunk/Tools
Revision
154117
Author
[email protected]
Date
2013-08-15 12:19:45 -0700 (Thu, 15 Aug 2013)

Log Message

<https://webkit.org/b/119856> Improve extract-localizable-strings messages

Reviewed by Darin Adler.

* Scripts/extract-localizable-strings: When the strings file disagrees with the source code,
added a message that points to the source code. Removed some unnecessary repetition of what
is already in the file.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (154116 => 154117)


--- trunk/Tools/ChangeLog	2013-08-15 19:08:48 UTC (rev 154116)
+++ trunk/Tools/ChangeLog	2013-08-15 19:19:45 UTC (rev 154117)
@@ -1,3 +1,13 @@
+2013-08-15  Dan Bernstein  <[email protected]>
+
+        <https://webkit.org/b/119856> Improve extract-localizable-strings messages
+
+        Reviewed by Darin Adler.
+
+        * Scripts/extract-localizable-strings: When the strings file disagrees with the source code,
+        added a message that points to the source code. Removed some unnecessary repetition of what
+        is already in the file.
+
 2013-08-15  Andy Estes  <[email protected]>
 
         <https://webkit.org/b/119853> REGRESSION (r139343): WebKit crashes when canceling a load inside webView:resource:didFinishLoadingFromDataSource:

Modified: trunk/Tools/Scripts/extract-localizable-strings (154116 => 154117)


--- trunk/Tools/Scripts/extract-localizable-strings	2013-08-15 19:08:48 UTC (rev 154116)
+++ trunk/Tools/Scripts/extract-localizable-strings	2013-08-15 19:19:45 UTC (rev 154117)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
+# Copyright (C) 2006, 2007, 2009, 2010, 2013 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -409,15 +409,17 @@
             {
                 my $string = delete $stringByKey{$1};
                 if (!defined $string) {
-                    print "$fileToUpdate:$.: unused key \"$1\" (preceding comment: /* $lastComment */)\n";
+                    print "$fileToUpdate:$.: unused key \"$1\"\n";
                     $sawError = 1;
                 } else {
                     if (!($string eq $2)) {
-                        print "$fileToUpdate:$.: unexpected value \"$2\" for key \"$1\" (expected \"$string\")\n";
+                        print "$fileToUpdate:$.: unexpected value \"$2\" for key \"$1\"\n";
+                        print "$fileByKey{$1}:$lineByKey{$1}: expected value \"$string\" defined here\n";
                         $sawError = 1;
                     }
                     if (!($lastComment eq $commentByKey{$1})) {
-                        print "$fileToUpdate:$.: unexpected comment /* $lastComment */ for key \"$1\" (expected /* $commentByKey{$1} */)\n";
+                        print "$fileToUpdate:$.: unexpected comment /* $lastComment */ for key \"$1\"\n";
+                        print "$fileByKey{$1}:$lineByKey{$1}: expected comment /* $commentByKey{$1} */ defined here\n";
                         $sawError = 1;
                     }
                 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to