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

vascool · gitster · commit 55aa04423f14 · 2016-12-14T11:00:05.000-08:00
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-&gt;{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 &lt;vascomalmeida@sapo.pt&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
@@ -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, +{

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ sub list_modified {`
`294`	`294`	`my ($change, $bin);`
`295`	`295`	`$file = unquote_path($file);`
`296`	`296`	`if ($add eq '-' && $del eq '-') {`
`297`		`- $change = 'binary';`
	`297`	`+ $change = __('binary');`
`298`	`298`	`$bin = 1;`
`299`	`299`	`}`
`300`	`300`	`else {`
`@@ -303,7 +303,7 @@ sub list_modified {`
`303`	`303`	`$data{$file} = {`
`304`	`304`	`INDEX => $change,`
`305`	`305`	`BINARY => $bin,`
`306`		`- FILE => 'nothing',`
	`306`	`+ FILE => __('nothing'),`
`307`	`307`	`}`
`308`	`308`	`}`
`309`	`309`	`elsif (($adddel, $file) =`
`@@ -319,7 +319,7 @@ sub list_modified {`
`319`	`319`	`$file = unquote_path($file);`
`320`	`320`	`my ($change, $bin);`
`321`	`321`	`if ($add eq '-' && $del eq '-') {`
`322`		`- $change = 'binary';`
	`322`	`+ $change = __('binary');`
`323`	`323`	`$bin = 1;`
`324`	`324`	`}`
`325`	`325`	`else {`
`@@ -339,7 +339,7 @@ sub list_modified {`
`339`	`339`	`$file = unquote_path($2);`
`340`	`340`	`if (!exists $data{$file}) {`
`341`	`341`	`$data{$file} = +{`
`342`		`- INDEX => 'unchanged',`
	`342`	`+ INDEX => __('unchanged'),`
`343`	`343`	`BINARY => 0,`
`344`	`344`	`};`
`345`	`345`	`}`
`@@ -354,10 +354,10 @@ sub list_modified {`
`354`	`354`
`355`	`355`	`if ($only) {`
`356`	`356`	`if ($only eq 'index-only') {`
`357`		`- next if ($it->{INDEX} eq 'unchanged');`
	`357`	`+ next if ($it->{INDEX} eq __('unchanged'));`
`358`	`358`	`}`
`359`	`359`	`if ($only eq 'file-only') {`
`360`		`- next if ($it->{FILE} eq 'nothing');`
	`360`	`+ next if ($it->{FILE} eq __('nothing'));`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`	`push @return, +{`