i18n: difftool: mark warnings for translation
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Dec 14, 2016 at 11:54 UTC
a948ebacbf0debd5129f4f528229183c97ff90b1
1 file changed
+12
-10
git-difftool.perl
+12
-10
@@ -22,6 +22,7 @@ use File::Path qw(mkpath rmtree);
22
use File::Temp qw(tempdir);
23
use Getopt::Long qw(:config pass_through);
24
use Git;
25
+use Git::I18N;
26
27
sub usage
28
{
@@ -122,7 +123,7 @@ sub setup_dir_diff
123
my $i = 0;
124
while ($i < $#rawdiff) {
125
if ($rawdiff[$i] =~ /^::/) {
125
- warn << 'EOF';
126
+ warn __ <<'EOF';
127
Combined diff formats ('-c' and '--cc') are not supported in
128
directory diff mode ('-d' and '--dir-diff').
129
EOF
@@ -338,7 +339,7 @@ sub main
339
if (length($opts{difftool_cmd}) > 0) {
340
$ENV{GIT_DIFF_TOOL} = $opts{difftool_cmd};
341
} else {
341
- print "No <tool> given for --tool=<tool>\n";
342
+ print __("No <tool> given for --tool=<tool>\n");
343
usage(1);
344
}
345
}
@@ -346,7 +347,7 @@ sub main
347
if (length($opts{extcmd}) > 0) {
348
$ENV{GIT_DIFFTOOL_EXTCMD} = $opts{extcmd};
349
} else {
349
- print "No <cmd> given for --extcmd=<cmd>\n";
350
+ print __("No <cmd> given for --extcmd=<cmd>\n");
351
usage(1);
352
}
353
}
@@ -419,11 +420,11 @@ sub dir_diff
420
}
421
422
if (exists $wt_modified{$file} and exists $tmp_modified{$file}) {
422
- my $errmsg = "warning: Both files modified: ";
423
- $errmsg .= "'$workdir/$file' and '$b/$file'.\n";
424
- $errmsg .= "warning: Working tree file has been left.\n";
425
- $errmsg .= "warning:\n";
426
- warn $errmsg;
423
+ warn sprintf(__(
424
+ "warning: Both files modified:\n" .
425
+ "'%s/%s' and '%s/%s'.\n" .
426
+ "warning: Working tree file has been left.\n" .
427
+ "warning:\n"), $workdir, $file, $b, $file);
428
$error = 1;
429
} elsif (exists $tmp_modified{$file}) {
430
my $mode = stat("$b/$file")->mode;
@@ -435,8 +436,9 @@ sub dir_diff
436
}
437
}
438
if ($error) {
438
- warn "warning: Temporary files exist in '$tmpdir'.\n";
439
- warn "warning: You may want to cleanup or recover these.\n";
439
+ warn sprintf(__(
440
+ "warning: Temporary files exist in '%s'.\n" .
441
+ "warning: You may want to cleanup or recover these.\n"), $tmpdir);
442
exit(1);
443
} else {
444
exit_cleanup($tmpdir, $rc);