mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: add--interactive: mark status words for translation

Browse Source 
Mark words 'nothing', 'unchanged' and 'binary' used to display what has
been staged or not, in "git add -i" status command.

Alternatively one could mark N__('nothing') no-op in order to
xgettext(1) extract the string and then trigger the translation at run
time only with __($print->{FILE}), but that has the side effect of triggering
retrieval of translations for the changes indicator too (e.g. +2/-1)
which may or may not be a problem.

To avoid that potential problem, mark only where there is certain to
trigger translation only of those words but in this case we must also
retrieve the translation for the eq tests, since the value assigned was
of the translation, not the English source.

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:34 -01:00
committed by Junio C Hamano
parent ef84426308
commit 55aa04423f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-add--interactive.perl
View File

@ -294,7 +294,7 @@ sub list_modified {
my ($change, $bin);
$file = unquote_path($file);
if ($add eq '-' && $del eq '-') {
$change = 'binary';
$change = __('binary');
$bin = 1;
}
else {
@ -303,7 +303,7 @@ sub list_modified {
$data{$file} = {
INDEX => $change,
BINARY => $bin,
FILE => 'nothing',
FILE => __('nothing'),
}
}
elsif (($adddel, $file) =
@ -319,7 +319,7 @@ sub list_modified {
$file = unquote_path($file);
my ($change, $bin);
if ($add eq '-' && $del eq '-') {
$change = 'binary';
$change = __('binary');
$bin = 1;
}
else {
@ -339,7 +339,7 @@ sub list_modified {
$file = unquote_path($2);
if (!exists $data{$file}) {
$data{$file} = +{
INDEX => 'unchanged',
INDEX => __('unchanged'),
BINARY => 0,
};
}
@ -354,10 +354,10 @@ sub list_modified {
if ($only) {
if ($only eq 'index-only') {
next if ($it->{INDEX} eq 'unchanged');
next if ($it->{INDEX} eq __('unchanged'));
}
if ($only eq 'file-only') {
next if ($it->{FILE} eq 'nothing');
next if ($it->{FILE} eq __('nothing'));
}
}
push @return, +{