Changeset 154117 in webkit

Timestamp:

Aug 15, 2013 12:19:45 PM (11 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/extract-localizable-strings (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-08-15  Dan Bernstein  <mitz@apple.com>
+
+        <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  <aestes@apple.com>
 

trunk/Tools/Scripts/extract-localizable-strings

@@ -1 +1 @@
 #!/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
@@ -410 +410 @@
                 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;
                     }