mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

i18n: add--interactive: mark patch prompt for translation

Browse Source 
Mark prompt message assembled in place for translation, unfolding each
use case for each entry in the %patch_modes hash table.

Previously, this script relied on whether $patch_mode was set to run the
command patch_update_cmd() or show status and loop the main loop. Now,
it uses $cmd to indicate we must run patch_update_cmd() and $patch_mode
is used to tell which flavor of the %patch_modes are we on.  This is
introduced in order to be able to mark and unfold the message prompt
knowing in which context we are.

The tracking of context was done previously by point %patch_mode_flavour
hash table to the correct entry of %patch_modes, focusing only on value
of %patch_modes. Now, we are also interested in the key ('staged',
'stash', 'checkout_head', ...).

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-12-14 11:54:30 -01:00 committed by Junio C Hamano
parent c4a85c3b8e
commit 0539d5e6d5
4 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2110,7 +2110,7 @@ XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
--keyword=gettextln --keyword=eval_gettextln
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
--keyword=__ --keyword="__n:1,2"
--keyword=__ --keyword=N__ --keyword="__n:1,2"
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
LOCALIZED_SH = $(SCRIPT_SH)
LOCALIZED_SH += git-parse-remote.sh

54
git-add--interactive.perl
View File

@ -92,6 +92,7 @@ sub colored {
}
# command line options
my $cmd;
my $patch_mode;
my $patch_mode_revision;
@ -172,7 +173,8 @@ my %patch_modes = (
},
);
my %patch_mode_flavour = %{$patch_modes{stage}};
$patch_mode = 'stage';
my %patch_mode_flavour = %{$patch_modes{$patch_mode}};
sub run_cmd_pipe {
if ($^O eq 'MSWin32') {
@ -1308,6 +1310,44 @@ sub display_hunks {
return $i;
}
my %patch_update_prompt_modes = (
stage => {
mode => N__("Stage mode change [y,n,q,a,d,/%s,?]? "),
deletion => N__("Stage deletion [y,n,q,a,d,/%s,?]? "),
hunk => N__("Stage this hunk [y,n,q,a,d,/%s,?]? "),
},
stash => {
mode => N__("Stash mode change [y,n,q,a,d,/%s,?]? "),
deletion => N__("Stash deletion [y,n,q,a,d,/%s,?]? "),
hunk => N__("Stash this hunk [y,n,q,a,d,/%s,?]? "),
},
reset_head => {
mode => N__("Unstage mode change [y,n,q,a,d,/%s,?]? "),
deletion => N__("Unstage deletion [y,n,q,a,d,/%s,?]? "),
hunk => N__("Unstage this hunk [y,n,q,a,d,/%s,?]? "),
},
reset_nothead => {
mode => N__("Apply mode change to index [y,n,q,a,d,/%s,?]? "),
deletion => N__("Apply deletion to index [y,n,q,a,d,/%s,?]? "),
hunk => N__("Apply this hunk to index [y,n,q,a,d,/%s,?]? "),
},
checkout_index => {
mode => N__("Discard mode change from worktree [y,n,q,a,d,/%s,?]? "),
deletion => N__("Discard deletion from worktree [y,n,q,a,d,/%s,?]? "),
hunk => N__("Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "),
},
checkout_head => {
mode => N__("Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "),
deletion => N__("Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "),
hunk => N__("Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "),
},
checkout_nothead => {
mode => N__("Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "),
deletion => N__("Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "),
hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "),
},
);
sub patch_update_file {
my $quit = 0;
my ($ix, $num);
@ -1380,12 +1420,9 @@ sub patch_update_file {
for (@{$hunk[$ix]{DISPLAY}}) {
print;
}
print colored $prompt_color, $patch_mode_flavour{VERB},
($hunk[$ix]{TYPE} eq 'mode' ? ' mode change' :
$hunk[$ix]{TYPE} eq 'deletion' ? ' deletion' :
' this hunk'),
$patch_mode_flavour{TARGET},
" [y,n,q,a,d,/$other,?]? ";
print colored $prompt_color,
sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other);
my $line = prompt_single_character;
last unless defined $line;
if ($line) {
@ -1641,6 +1678,7 @@ sub process_args {
die sprintf(__("invalid argument %s, expecting --"),
$arg) unless $arg eq "--";
%patch_mode_flavour = %{$patch_modes{$patch_mode}};
$cmd = 1;
}
elsif ($arg ne "--") {
die sprintf(__("invalid argument %s, expecting --"), $arg);
@ -1677,7 +1715,7 @@ sub main_loop {
process_args();
refresh();
if ($patch_mode) {
if ($cmd) {
patch_update_cmd();
}
else {

11
perl/Git/I18N.pm
View File

@ -13,7 +13,7 @@ BEGIN {
}
}
our @EXPORT = qw(__ __n);
our @EXPORT = qw(__ __n N__);
our @EXPORT_OK = @EXPORT;
sub __bootstrap_locale_messages {
@ -54,6 +54,8 @@ BEGIN
*__ = sub ($) { $_[0] };
*__n = sub ($$$) { $_[2] == 1 ? $_[0] : $_[1] };
};
sub N__($) { return shift; }
}
1;
@ -74,6 +76,7 @@ Git::I18N - Perl interface to Git's Gettext localizations
printf __n("commited %d file\n", "commited %d files\n", $files), $files;
=head1 DESCRIPTION
Git's internal Perl interface to gettext via L<Locale::Messages>. If
@ -95,6 +98,12 @@ passthrough fallback function.
L<Locale::Messages>'s ngettext function or passthrough fallback function.
=head2 N__($)
No-operation that only returns its argument. Use this if you want xgettext to
extract the text to the pot template but do not want to trigger retrival of the
translation at run time.
=head1 AUTHOR
E<AElig>var ArnfjE<ouml>rE<eth> Bjarmason <avarab@gmail.com>

5
t/t0202/test.pl
View File

@ -4,7 +4,7 @@ use lib (split(/:/, $ENV{GITPERLLIB}));
use strict;
use warnings;
use POSIX qw(:locale_h);
use Test::More tests => 11;
use Test::More tests => 13;
use Git::I18N;
my $has_gettext_library = $Git::I18N::__HAS_LIBRARY;
@ -32,6 +32,7 @@ is_deeply(\@Git::I18N::EXPORT, \@Git::I18N::EXPORT_OK, "sanity: Git::I18N export
my %prototypes = (qw(
__ $
__n $$$
N__ $
));
while (my ($sub, $proto) = each %prototypes) {
is(prototype(\&{"Git::I18N::$sub"}), $proto, "sanity: $sub has a $proto prototype");
@ -55,6 +56,8 @@ is_deeply(\@Git::I18N::EXPORT, \@Git::I18N::EXPORT_OK, "sanity: Git::I18N export
"Get singular string through __n() in C locale");
is(__n($got_singular, $got_plural, 2), $expect_plural,
"Get plural string through __n() in C locale");
is(N__($got), $expect, "Passing a string through N__() in the C locale works");
}
# Test a basic message on different locales