X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/570491d8e2e9a2bfbb2759deeb4775a79c13241c..12f78fc254953b2c5110f34bd089364fd3f6b9e5:/script/locale/diff

diff --git a/script/locale/diff b/script/locale/diff
index d0dce719a..e2c9ee733 100755
--- a/script/locale/diff
+++ b/script/locale/diff
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+use feature ':5.10';
 use strict;
 use warnings;
 use YAML::Syck qw(Load LoadFile);
@@ -17,13 +18,16 @@ 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 --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
     # unlikley to be translated
     diff --untranslated-values-all en.yml is.yml
 
+    # Check that interpolated variables ({{var}} and [[var]]) are the same
+    diff --validate-variables en.yml is.yml
+
 =head1 DESCRIPTION
 
 This utility prints the differences between two YAML files using
@@ -46,10 +50,12 @@ new entries from F<en.yml> to a local file.
 
 =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.
 
@@ -57,6 +63,11 @@ This helps to find untranslated values.
 
 Like C<--untranslated-values> but ignores blacklists.
 
+=item --validate-variables
+
+Check that interpolated Ruby i18n variables (C<{{foo}}> and
+C<[[foo]]>) are equivalent in the two provided files.
+
 =back
 
 =head1 AUTHOR
@@ -73,10 +84,11 @@ Getopt::Long::Parser->new(
     'keys' => \my $keys,
     'untranslated-values' => \my $untranslated_values,
     'untranslated-values-all' => \my $untranslated_values_all,
+    'validate-variables' => \my $validate_variables,
 ) or help();
 
 # --keys is the default
-$keys = 1 if not $untranslated_values_all and not $untranslated_values;
+$keys = 1 if not $untranslated_values_all and not $untranslated_values and not $validate_variables;
 
 # On --help
 help() if $help;
@@ -92,10 +104,9 @@ my $to_data   = LoadFile($to);
 my $from_parsed = { iterate($from_data->{basename($from)}) };
 my $to_parsed = { iterate($to_data->{basename($to)}) };
 
-# Since this used to be the default, support that...
 if ($keys)
 {
-    print_key_differences();
+    print_key_differences($from_parsed, $to_parsed);
 }
 elsif ($untranslated_values or $untranslated_values_all)
 {
@@ -106,25 +117,30 @@ elsif ($untranslated_values or $untranslated_values_all)
         @untranslated = prune_untranslated_with_blacklist(basename($to), @untranslated);
     }
 
-    print $_, "\n" for @untranslated;
+    say for @untranslated;
+} elsif ($validate_variables)
+{
+    print_validate_variables($from_parsed, $to_parsed);
 }
 
 exit 0;
 
 sub print_key_differences
 {
+    my ($f, $t) = @_;
+
     # Hack around Test::Differences wanting a Test::* module loaded
     $INC{"Test.pm"} = 1;
     sub Test::ok { print shift }
 
     # Diff the tree
-    eq_or_diff([ sort keys %$from_parsed ], [ sort keys %$to_parsed ]);
+    eq_or_diff([ sort keys %$f ], [ sort keys %$t ]);
 }
 
 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
@@ -140,10 +156,6 @@ sub prune_untranslated_with_blacklist
 
     my %bw_list = (%$default, %$this_language);
     
-    use feature ':5.10';
-    use Data::Dump 'dump';
-    say STDERR dump \%bw_list;
-
     while (my ($key, $blacklisted) = each %bw_list)
     {
         # FIXME: Does syck actually support true/false booleans in yaml?
@@ -153,6 +165,38 @@ sub prune_untranslated_with_blacklist
     sort keys %keys;
 }
 
+sub print_validate_variables
+{
+    my ($f, $t) = @_;
+
+    while (my ($key, $val) = each %$f)
+    {
+        next if exists $f->{$key} and not exists $t->{$key};
+
+        my @from_var = parse_variables_from_string($f->{$key});
+        my @to_var   = parse_variables_from_string($t->{$key});
+
+        unless (@from_var ~~ @to_var) {
+            say "$key in $from has (@from_var) and $to has (@to_var)";
+        }
+
+    }
+}
+
+sub parse_variables_from_string
+{
+    my ($string) = @_;
+
+    # This probably matches most of the variables
+    my $var = qr/ [a-z0-9_]+? /xs;
+
+    if (my @var = $string =~ m/ \{\{ ($var) \}\} | \[\[ ($var) \]\] /gsx) {
+        return sort grep { defined } @var;
+    } else {
+        return;
+    }
+}
+
 sub iterate
 {
     my ($hash, @path) = @_;
@@ -203,6 +247,53 @@ untranslated_values:
     html.dir: true
     layouts.intro_3_bytemark: true
     layouts.intro_3_ucl: true
+    layouts.project_name.h1: true
+    layouts.project_name.title: true
+    site.index.license.project_url: true
+    browse.relation_member.entry: true
+
   de:
+    activerecord.attributes.message.sender: true
+    activerecord.attributes.trace.name: true
+    activerecord.models.changeset: true
+    activerecord.models.relation: true
+    browse.changeset.changeset: true
+    browse.changeset.changesetxml: true
+    browse.changeset.osmchangexml: true
+    browse.changeset.title: true
+    browse.common_details.version: true
+    browse.containing_relation.relation: true
+    browse.relation.relation: true
+    browse.relation.relation_title: true
+    browse.start_rjs.details: true
+    browse.start_rjs.object_list.details: true
+    browse.tag_details.tags: true
+    changeset.changesets.id: true
+    export.start.export_button: true
+    export.start.format: true
+    export.start.output: true
+    export.start.zoom: true
+    export.start_rjs.export: true
     layouts.export: true
-
+    layouts.shop: true
+    site.edit.anon_edits: true
+    site.index.license.license_name: true
+    site.index.permalink: true
+    site.key.table.entry.park: true
+    site.search.submit_text: true
+    trace.edit.tags: true
+    trace.trace.in: true
+    trace.trace_form.tags: true
+    trace.trace_optionals.tags: 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