i18n: add--interactive: mark strings for translation

Mark simple strings (without interpolation) for translation.

Brackets around first parameter of ternary operator is necessary because
otherwise xgettext fails to extract strings marked for translation from
the rest of the file.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 642cce1ac6e158207f4273d4e1bf1e7928865b18..a4b29840a9806fb563fc38565bd40cbe79dcb52b 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -4,6 +4,7 @@
 use strict;
 use warnings;
 use Git;
 use strict;
 use warnings;
 use Git;

+use Git::I18N;

 
 binmode(STDOUT, ":raw");
 
 
 binmode(STDOUT, ":raw");
 


@@ -252,8 +253,9 @@ sub list_untracked {
        run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV);
 }
 
        run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV);
 }
 

-my $status_fmt = '%12s %12s %s';
-my $status_head = sprintf($status_fmt, 'staged', 'unstaged', 'path');
+# TRANSLATORS: you can adjust this to align "git add -i" status menu
+my $status_fmt = __('%12s %12s %s');
+my $status_head = sprintf($status_fmt, __('staged'), __('unstaged'), __('path'));

 
 {
        my $initial;
 
 {
        my $initial;


@@ -679,7 +681,7 @@ sub update_cmd {
        my @mods = list_modified('file-only');
        return if (!@mods);
 
        my @mods = list_modified('file-only');
        return if (!@mods);
 

-       my @update = list_and_choose({ PROMPT => 'Update',
+       my @update = list_and_choose({ PROMPT => __('Update'),

                                       HEADER => $status_head, },
                                     @mods);
        if (@update) {
                                       HEADER => $status_head, },
                                     @mods);
        if (@update) {


@@ -691,7 +693,7 @@ sub update_cmd {
 }
 
 sub revert_cmd {
 }
 
 sub revert_cmd {

-       my @update = list_and_choose({ PROMPT => 'Revert',
+       my @update = list_and_choose({ PROMPT => __('Revert'),

                                       HEADER => $status_head, },
                                     list_modified());
        if (@update) {
                                       HEADER => $status_head, },
                                     list_modified());
        if (@update) {


@@ -725,13 +727,13 @@ sub revert_cmd {
 }
 
 sub add_untracked_cmd {
 }
 
 sub add_untracked_cmd {

-       my @add = list_and_choose({ PROMPT => 'Add untracked' },
+       my @add = list_and_choose({ PROMPT => __('Add untracked') },

                                  list_untracked());
        if (@add) {
                system(qw(git update-index --add --), @add);
                say_n_paths('added', @add);
        } else {
                                  list_untracked());
        if (@add) {
                system(qw(git update-index --add --), @add);
                say_n_paths('added', @add);
        } else {

-               print "No untracked files.\n";
+               print __("No untracked files.\n");

        }
        print "\n";
 }
        }
        print "\n";
 }


@@ -1163,8 +1165,14 @@ sub edit_hunk_loop {
                }
                else {
                        prompt_yesno(
                }
                else {
                        prompt_yesno(

-                               'Your edited hunk does not apply. Edit again '
-                               . '(saying "no" discards!) [y/n]? '
+                               # TRANSLATORS: do not translate [y/n]
+                               # The program will only accept that input
+                               # at this point.
+                               # Consider translating (saying "no" discards!) as
+                               # (saying "n" for "no" discards!) if the translation
+                               # of the word "no" does not start with n.
+                               __('Your edited hunk does not apply. Edit again '
+                                  . '(saying "no" discards!) [y/n]? ')

                                ) or return undef;
                }
        }
                                ) or return undef;
                }
        }


@@ -1210,11 +1218,11 @@ sub apply_patch_for_checkout_commit {
                run_git_apply 'apply '.$reverse, @_;
                return 1;
        } elsif (!$applies_index) {
                run_git_apply 'apply '.$reverse, @_;
                return 1;
        } elsif (!$applies_index) {

-               print colored $error_color, "The selected hunks do not apply to the index!\n";
-               if (prompt_yesno "Apply them to the worktree anyway? ") {
+               print colored $error_color, __("The selected hunks do not apply to the index!\n");
+               if (prompt_yesno __("Apply them to the worktree anyway? ")) {

                        return run_git_apply 'apply '.$reverse, @_;
                } else {
                        return run_git_apply 'apply '.$reverse, @_;
                } else {

-                       print colored $error_color, "Nothing was applied.\n";
+                       print colored $error_color, __("Nothing was applied.\n");

                        return 0;
                }
        } else {
                        return 0;
                }
        } else {


@@ -1234,9 +1242,9 @@ sub patch_update_cmd {
 
        if (!@mods) {
                if (@all_mods) {
 
        if (!@mods) {
                if (@all_mods) {

-                       print STDERR "Only binary files changed.\n";
+                       print STDERR __("Only binary files changed.\n");

                } else {
                } else {

-                       print STDERR "No changes.\n";
+                       print STDERR __("No changes.\n");

                }
                return 0;
        }
                }
                return 0;
        }


@@ -1244,7 +1252,7 @@ sub patch_update_cmd {
                @them = @mods;
        }
        else {
                @them = @mods;
        }
        else {

-               @them = list_and_choose({ PROMPT => 'Patch update',
+               @them = list_and_choose({ PROMPT => __('Patch update'),

                                          HEADER => $status_head, },
                                        @mods);
        }
                                          HEADER => $status_head, },
                                        @mods);
        }


@@ -1394,12 +1402,12 @@ sub patch_update_file {
                                my $response = $1;
                                my $no = $ix > 10 ? $ix - 10 : 0;
                                while ($response eq '') {
                                my $response = $1;
                                my $no = $ix > 10 ? $ix - 10 : 0;
                                while ($response eq '') {

-                                       my $extra = "";

                                        $no = display_hunks(\@hunk, $no);
                                        if ($no < $num) {
                                        $no = display_hunks(\@hunk, $no);
                                        if ($no < $num) {

-                                               $extra = " (<ret> to see more)";
+                                               print __("go to which hunk (<ret> to see more)? ");
+                                       } else {
+                                               print __("go to which hunk? ");

                                        }
                                        }

-                                       print "go to which hunk$extra? ";

                                        $response = <STDIN>;
                                        if (!defined $response) {
                                                $response = '';
                                        $response = <STDIN>;
                                        if (!defined $response) {
                                                $response = '';


@@ -1436,7 +1444,7 @@ sub patch_update_file {
                        elsif ($line =~ m|^/(.*)|) {
                                my $regex = $1;
                                if ($1 eq "") {
                        elsif ($line =~ m|^/(.*)|) {
                                my $regex = $1;
                                if ($1 eq "") {

-                                       print colored $prompt_color, "search for regex? ";
+                                       print colored $prompt_color, __("search for regex? ");

                                        $regex = <STDIN>;
                                        if (defined $regex) {
                                                chomp $regex;
                                        $regex = <STDIN>;
                                        if (defined $regex) {
                                                chomp $regex;


@@ -1459,7 +1467,7 @@ sub patch_update_file {
                                        $iy++;
                                        $iy = 0 if ($iy >= $num);
                                        if ($ix == $iy) {
                                        $iy++;
                                        $iy = 0 if ($iy >= $num);
                                        if ($ix == $iy) {

-                                               error_msg "No hunk matches the given pattern\n";
+                                               error_msg __("No hunk matches the given pattern\n");

                                                last;
                                        }
                                }
                                                last;
                                        }
                                }


@@ -1471,7 +1479,7 @@ sub patch_update_file {
                                        $ix--;
                                }
                                else {
                                        $ix--;
                                }
                                else {

-                                       error_msg "No previous hunk\n";
+                                       error_msg __("No previous hunk\n");

                                }
                                next;
                        }
                                }
                                next;
                        }


@@ -1480,7 +1488,7 @@ sub patch_update_file {
                                        $ix++;
                                }
                                else {
                                        $ix++;
                                }
                                else {

-                                       error_msg "No next hunk\n";
+                                       error_msg __("No next hunk\n");

                                }
                                next;
                        }
                                }
                                next;
                        }


@@ -1493,13 +1501,13 @@ sub patch_update_file {
                                        }
                                }
                                else {
                                        }
                                }
                                else {

-                                       error_msg "No previous hunk\n";
+                                       error_msg __("No previous hunk\n");

                                }
                                next;
                        }
                        elsif ($line =~ /^j/) {
                                if ($other !~ /j/) {
                                }
                                next;
                        }
                        elsif ($line =~ /^j/) {
                                if ($other !~ /j/) {

-                                       error_msg "No next hunk\n";
+                                       error_msg __("No next hunk\n");

                                        next;
                                }
                        }
                                        next;
                                }
                        }


@@ -1557,18 +1565,18 @@ sub diff_cmd {
        my @mods = list_modified('index-only');
        @mods = grep { !($_->{BINARY}) } @mods;
        return if (!@mods);
        my @mods = list_modified('index-only');
        @mods = grep { !($_->{BINARY}) } @mods;
        return if (!@mods);

-       my (@them) = list_and_choose({ PROMPT => 'Review diff',
+       my (@them) = list_and_choose({ PROMPT => __('Review diff'),

                                     IMMEDIATE => 1,
                                     HEADER => $status_head, },
                                   @mods);
        return if (!@them);
                                     IMMEDIATE => 1,
                                     HEADER => $status_head, },
                                   @mods);
        return if (!@them);

-       my $reference = is_initial_commit() ? get_empty_tree() : 'HEAD';
+       my $reference = (is_initial_commit()) ? get_empty_tree() : 'HEAD';

        system(qw(git diff -p --cached), $reference, '--',
                map { $_->{VALUE} } @them);
 }
 
 sub quit_cmd {
        system(qw(git diff -p --cached), $reference, '--',
                map { $_->{VALUE} } @them);
 }
 
 sub quit_cmd {

-       print "Bye.\n";
+       print __("Bye.\n");

        exit(0);
 }
 
        exit(0);
 }
 


@@ -1591,32 +1599,32 @@ sub process_args {
                        if ($1 eq 'reset') {
                                $patch_mode = 'reset_head';
                                $patch_mode_revision = 'HEAD';
                        if ($1 eq 'reset') {
                                $patch_mode = 'reset_head';
                                $patch_mode_revision = 'HEAD';

-                               $arg = shift @ARGV or die "missing --";
+                               $arg = shift @ARGV or die __("missing --");

                                if ($arg ne '--') {
                                        $patch_mode_revision = $arg;
                                        $patch_mode = ($arg eq 'HEAD' ?
                                                       'reset_head' : 'reset_nothead');
                                if ($arg ne '--') {
                                        $patch_mode_revision = $arg;
                                        $patch_mode = ($arg eq 'HEAD' ?
                                                       'reset_head' : 'reset_nothead');

-                                       $arg = shift @ARGV or die "missing --";
+                                       $arg = shift @ARGV or die __("missing --");

                                }
                        } elsif ($1 eq 'checkout') {
                                }
                        } elsif ($1 eq 'checkout') {

-                               $arg = shift @ARGV or die "missing --";
+                               $arg = shift @ARGV or die __("missing --");

                                if ($arg eq '--') {
                                        $patch_mode = 'checkout_index';
                                } else {
                                        $patch_mode_revision = $arg;
                                        $patch_mode = ($arg eq 'HEAD' ?
                                                       'checkout_head' : 'checkout_nothead');
                                if ($arg eq '--') {
                                        $patch_mode = 'checkout_index';
                                } else {
                                        $patch_mode_revision = $arg;
                                        $patch_mode = ($arg eq 'HEAD' ?
                                                       'checkout_head' : 'checkout_nothead');

-                                       $arg = shift @ARGV or die "missing --";
+                                       $arg = shift @ARGV or die __("missing --");

                                }
                        } elsif ($1 eq 'stage' or $1 eq 'stash') {
                                $patch_mode = $1;
                                }
                        } elsif ($1 eq 'stage' or $1 eq 'stash') {
                                $patch_mode = $1;

-                               $arg = shift @ARGV or die "missing --";
+                               $arg = shift @ARGV or die __("missing --");

                        } else {
                                die "unknown --patch mode: $1";
                        }
                } else {
                        $patch_mode = 'stage';
                        } else {
                                die "unknown --patch mode: $1";
                        }
                } else {
                        $patch_mode = 'stage';

-                       $arg = shift @ARGV or die "missing --";
+                       $arg = shift @ARGV or die __("missing --");

                }
                die "invalid argument $arg, expecting --"
                    unless $arg eq "--";
                }
                die "invalid argument $arg, expecting --"
                    unless $arg eq "--";


@@ -1638,10 +1646,10 @@ sub main_loop {
                   [ 'help', \&help_cmd, ],
        );
        while (1) {
                   [ 'help', \&help_cmd, ],
        );
        while (1) {

-               my ($it) = list_and_choose({ PROMPT => 'What now',
+               my ($it) = list_and_choose({ PROMPT => __('What now'),

                                             SINGLETON => 1,
                                             LIST_FLAT => 4,
                                             SINGLETON => 1,
                                             LIST_FLAT => 4,

-                                            HEADER => '*** Commands ***',
+                                            HEADER => __('*** Commands ***'),

                                             ON_EOF => \&quit_cmd,
                                             IMMEDIATE => 1 }, @cmd);
                if ($it) {
                                             ON_EOF => \&quit_cmd,
                                             IMMEDIATE => 1 }, @cmd);
                if ($it) {