Moved find_token method into the token class, since that seems a more appropriate...

[rails.git] / script / locale / diff

diff --git a/script/locale/diff b/script/locale/diff
index 8ce35ad5c64bc90c9b4a34965aed1f4fb18b03a9..b19d42a267fed71a0936cf04eacf0de2a3000109 100755 (executable)
--- a/script/locale/diff
+++ b/script/locale/diff
@@ -2,10 +2,11 @@
 use feature ':5.10';
 use strict;
 use warnings;
 use feature ':5.10';
 use strict;
 use warnings;

-use YAML::Syck qw(Load LoadFile);
+use YAML::Syck qw(LoadFile);

 use Test::Differences;
 use Pod::Usage ();
 use Getopt::Long ();
 use Test::Differences;
 use Pod::Usage ();
 use Getopt::Long ();

+use File::Basename qw(fileparse);

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -18,7 +19,7 @@ locale-diff - Compare two YAML files and print how their datastructures differ
     diff --keys en.yml is.yml
 
     # --untranslated-values compares prints keys whose values don't differ
     diff --keys en.yml is.yml
 
     # --untranslated-values compares prints keys whose values don't differ

-    diff --untranslated-values-all en.yml is.yml
+    diff --untranslated-values en.yml is.yml

 
     # --untranslated-values-all compares prints keys whose values
     # don't differ. Ignoring the blacklist which prunes things
 
     # --untranslated-values-all compares prints keys whose values
     # don't differ. Ignoring the blacklist which prunes things


@@ -50,10 +51,12 @@ new entries from F<en.yml> to a local file.
 
 =item --untranslated-values
 
 
 =item --untranslated-values
 

-Show keys whose values are either exactly the same between the two
-files, or don't exist in the target file (the latter file
-specified). The values are pruned according to global and language
-specific blacklists found in the C<__DATA__> section of this script.
+Show keys that B<exist in both the compared files> and whose values
+are exactly the same. Use C<--keys> to a list of values that hasn't
+been merged.
+
+The values are pruned according to global and language specific
+blacklists found in the C<__DATA__> section of this script.

 
 This helps to find untranslated values.
 
 
 This helps to find untranslated values.
 


@@ -99,8 +102,8 @@ my ($from, $to) = @ARGV;
 my $from_data = LoadFile($from);
 my $to_data   = LoadFile($to);
 
 my $from_data = LoadFile($from);
 my $to_data   = LoadFile($to);
 

-my $from_parsed = { iterate($from_data->{basename($from)}) };
-my $to_parsed = { iterate($to_data->{basename($to)}) };
+my $from_parsed = { iterate($from_data->{fileparse($from, qr/\.[^.]*/)}) };
+my $to_parsed = { iterate($to_data->{fileparse($to, qr/\.[^.]*/)}) };

 
 if ($keys)
 {
 
 if ($keys)
 {


@@ -112,7 +115,7 @@ elsif ($untranslated_values or $untranslated_values_all)
 
     # Prune according to blacklist
     if ($untranslated_values) {
 
     # Prune according to blacklist
     if ($untranslated_values) {

-        @untranslated = prune_untranslated_with_blacklist(basename($to), @untranslated);
+        @untranslated = prune_untranslated_with_blacklist(scalar(fileparse($to, qr/\.[^.]*/)), @untranslated);

     }
 
     say for @untranslated;
     }
 
     say for @untranslated;


@@ -138,7 +141,7 @@ sub print_key_differences
 sub untranslated_keys
 {
     my ($from_parsed, $to_parsed) = @_;
 sub untranslated_keys
 {
     my ($from_parsed, $to_parsed) = @_;

-    sort grep { not exists $to_parsed->{$_} or $from_parsed->{$_} eq $to_parsed->{$_} } keys %$from_parsed;
+    sort grep { exists $to_parsed->{$_} and $from_parsed->{$_} eq $to_parsed->{$_} } keys %$from_parsed;

 }
 
 sub prune_untranslated_with_blacklist
 }
 
 sub prune_untranslated_with_blacklist


@@ -147,7 +150,7 @@ sub prune_untranslated_with_blacklist
     my %keys;
     @keys{@keys} = ();
 
     my %keys;
     @keys{@keys} = ();
 

-    my $end_yaml = Load(join '', <DATA>);
+    my $end_yaml = LoadFile(*DATA);

     my $untranslated_values = $end_yaml->{untranslated_values};
     my $default = $untranslated_values->{default};
     my $this_language = $untranslated_values->{$language} || {};
     my $untranslated_values = $end_yaml->{untranslated_values};
     my $default = $untranslated_values->{default};
     my $this_language = $untranslated_values->{$language} || {};


@@ -215,13 +218,6 @@ sub iterate
     return @ret;
 }
 
     return @ret;
 }
 

-sub basename
-{
-    my $name = shift;
-    $name =~ s[\..*?$][];
-    $name;
-}
-

 sub help
 {
     my %arg = @_;
 sub help
 {
     my %arg = @_;


@@ -248,6 +244,11 @@ untranslated_values:
     layouts.project_name.h1: true
     layouts.project_name.title: true
     site.index.license.project_url: true
     layouts.project_name.h1: true
     layouts.project_name.title: true
     site.index.license.project_url: true

+    browse.relation_member.entry: true
+
+    # #{{id}}
+    changeset.changeset.id: true
+

   de:
     activerecord.attributes.message.sender: true
     activerecord.attributes.trace.name: true
   de:
     activerecord.attributes.message.sender: true
     activerecord.attributes.trace.name: true


@@ -284,3 +285,24 @@ untranslated_values:
     trace.view.tags: true
     user.account.public editing.enabled link: true
 
     trace.view.tags: true
     user.account.public editing.enabled link: true
 

+  is:
+    # ({{link}})
+    site.edit.anon_edits: true
+
+    # Creative Commons Attribution-Share Alike 2.0
+    site.index.license.license_name: true
+
+    # http://creativecommons.org/licenses/by-sa/2.0/
+    site.index.license.license_url: true
+
+    # {{id}}
+    printable_name.with_id: true
+    
+    # {{name}} ({{id}})
+    printable_name.with_name: true
+
+    # {{type}} 
+    geocoder.search_osm_namefinder.prefix: true
+
+    # {{suffix}}, {{parentname}}
+    geocoder.search_osm_namefinder.suffix_suburb: true