Skip to content

Commit

Permalink
i18n: send-email: mark string with interpolation for translation
Browse files Browse the repository at this point in the history 
Mark warnings, errors and other messages that are interpolated for
translation.

We call sprintf() before calling die() and in few other circumstances in
order to replace the values on the placeholders.

Signed-off-by: Vasco Almeida <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
@vascool @gitster
vascool authored and gitster committed Dec 14, 2016
1 parent 4649310 commit 3c5cd20
Showing 1 changed file with 47 additions and 40 deletions.
87 changes: 47 additions & 40 deletions git-send-email.perl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,13 @@ sub signal_handler {
# tmp files from --compose
if (defined $compose_filename) {
if (-e $compose_filename) {
print "'$compose_filename' contains an intermediate version of the email you were composing.\n";
printf __("'%s' contains an intermediate version ".
"of the email you were composing.\n"),
$compose_filename;
}
if (-e ($compose_filename . ".final")) {
print "'$compose_filename.final' contains the composed email.\n"
printf __("'%s.final' contains the composed email.\n"),
$compose_filename;
}
}

Expand Down Expand Up @@ -431,7 +434,7 @@ sub read_config {
my(%suppress_cc);
if (@suppress_cc) {
foreach my $entry (@suppress_cc) {
die "Unknown --suppress-cc field: '$entry'\n"
die sprintf(__("Unknown --suppress-cc field: '%s'\n"), $entry)
unless $entry =~ /^(?:all|cccmd|cc|author|self|sob|body|bodycc)$/;
$suppress_cc{$entry} = 1;
}
Expand Down Expand Up @@ -460,7 +463,7 @@ sub read_config {
if ($confirm_unconfigured) {
$confirm = scalar %suppress_cc ? 'compose' : 'auto';
};
die "Unknown --confirm setting: '$confirm'\n"
die sprintf(__("Unknown --confirm setting: '%s'\n"), $confirm)
unless $confirm =~ /^(?:auto|cc|compose|always|never)/;

# Debugging, print out the suppressions.
Expand Down Expand Up @@ -492,16 +495,16 @@ sub split_addrs {
sub parse_sendmail_alias {
local $_ = shift;
if (/"/) {
print STDERR "warning: sendmail alias with quotes is not supported: $_\n";
printf STDERR __("warning: sendmail alias with quotes is not supported: %s\n"), $_;
} elsif (/:include:/) {
print STDERR "warning: `:include:` not supported: $_\n";
printf STDERR __("warning: `:include:` not supported: %s\n"), $_;
} elsif (/[\/|]/) {
print STDERR "warning: `/file` or `|pipe` redirection not supported: $_\n";
printf STDERR __("warning: `/file` or `|pipe` redirection not supported: %s\n"), $_;
} elsif (/^(\S+?)\s*:\s*(.+)$/) {
my ($alias, $addr) = ($1, $2);
$aliases{$alias} = [ split_addrs($addr) ];
} else {
print STDERR "warning: sendmail line is not recognized: $_\n";
printf STDERR __("warning: sendmail line is not recognized: %s\n"), $_;
}
}

Expand Down Expand Up @@ -582,11 +585,11 @@ sub is_format_patch_arg {
if (defined($format_patch)) {
return $format_patch;
}
die(<<EOF);
File '$f' exists but it could also be the range of commits
die sprintf(__ <<EOF, $f, $f);
File '%s' exists but it could also be the range of commits
to produce patches for. Please disambiguate by...
* Saying "./$f" if you mean a file; or
* Saying "./%s" if you mean a file; or
* Giving --format-patch option if you mean a range.
EOF
} catch Git::Error::Command with {
Expand All @@ -604,7 +607,7 @@ sub is_format_patch_arg {
@ARGV = ();
} elsif (-d $f and !is_format_patch_arg($f)) {
opendir my $dh, $f
or die "Failed to opendir $f: $!";
or die sprintf(__("Failed to opendir %s: %s"), $f, $!);

push @files, grep { -f $_ } map { catfile($f, $_) }
sort readdir $dh;
Expand All @@ -628,7 +631,8 @@ sub is_format_patch_arg {
foreach my $f (@files) {
unless (-p $f) {
my $error = validate_patch($f);
$error and die "fatal: $f: $error\nwarning: no patches were sent\n";
$error and die sprintf(__("fatal: %s: %s\nwarning: no patches were sent\n"),
$f, $error);
}
}
}
Expand All @@ -651,7 +655,7 @@ sub get_patch_subject {
return "GIT: $1\n";
}
close $fh;
die "No subject line in $fn ?";
die sprintf(__("No subject line in %s?"), $fn);
}

if ($compose) {
Expand All @@ -661,7 +665,7 @@ sub get_patch_subject {
tempfile(".gitsendemail.msg.XXXXXX", DIR => $repo->repo_path()) :
tempfile(".gitsendemail.msg.XXXXXX", DIR => "."))[1];
open my $c, ">", $compose_filename
or die "Failed to open for writing $compose_filename: $!";
or die sprintf(__("Failed to open for writing %s: %s"), $compose_filename, $!);


my $tpl_sender = $sender || $repoauthor || $repocommitter || '';
Expand Down Expand Up @@ -692,10 +696,10 @@ sub get_patch_subject {
}

open my $c2, ">", $compose_filename . ".final"
or die "Failed to open $compose_filename.final : " . $!;
or die sprintf(__("Failed to open %s.final: %s"), $compose_filename, $!);

open $c, "<", $compose_filename
or die "Failed to open $compose_filename : " . $!;
or die sprintf(__("Failed to open %s: %s"), $compose_filename, $!);

my $need_8bit_cte = file_has_nonascii($compose_filename);
my $in_body = 0;
Expand Down Expand Up @@ -769,7 +773,9 @@ sub ask {
return $resp;
}
if ($confirm_only) {
my $yesno = $term->readline("Are you sure you want to use <$resp> [y/N]? ");
my $yesno = $term->readline(
# TRANSLATORS: please keep [y/N] as is.
sprintf(__("Are you sure you want to use <%s> [y/N]? "), $resp));
if (defined $yesno && $yesno =~ /y/i) {
return $resp;
}
Expand Down Expand Up @@ -811,9 +817,9 @@ sub file_declares_8bit_cte {
if (!$force) {
for my $f (@files) {
if (get_patch_subject($f) =~ /\Q*** SUBJECT HERE ***\E/) {
die "Refusing to send because the patch\n\t$f\n"
die sprintf(__("Refusing to send because the patch\n\t%s\n"
. "has the template subject '*** SUBJECT HERE ***'. "
. "Pass --force if you really want to send.\n";
. "Pass --force if you really want to send.\n"), $f);
}
}
}
Expand Down Expand Up @@ -848,7 +854,7 @@ sub expand_aliases {
sub expand_one_alias {
my $alias = shift;
if ($EXPANDED_ALIASES{$alias}) {
die "fatal: alias '$alias' expands to itself\n";
die sprintf(__("fatal: alias '%s' expands to itself\n"), $alias);
}
local $EXPANDED_ALIASES{$alias} = 1;
return $aliases{$alias} ? expand_aliases(@{$aliases{$alias}}) : $alias;
Expand Down Expand Up @@ -910,15 +916,15 @@ sub extract_valid_address {
sub extract_valid_address_or_die {
my $address = shift;
$address = extract_valid_address($address);
die "error: unable to extract a valid address from: $address\n"
die sprintf(__("error: unable to extract a valid address from: %s\n"), $address)
if !$address;
return $address;
}

sub validate_address {
my $address = shift;
while (!extract_valid_address($address)) {
print STDERR "error: unable to extract a valid address from: $address\n";
printf STDERR __("error: unable to extract a valid address from: %s\n"), $address;
# TRANSLATORS: Make sure to include [q] [d] [e] in your
# translation. The program will only accept English input
# at this point.
Expand Down Expand Up @@ -1223,7 +1229,7 @@ sub ssl_verify_params {
return (SSL_verify_mode => SSL_VERIFY_PEER(),
SSL_ca_file => $smtp_ssl_cert_path);
} else {
die "CA path \"$smtp_ssl_cert_path\" does not exist";
die sprintf(__("CA path \"%s\" does not exist"), $smtp_ssl_cert_path);
}
}

Expand Down Expand Up @@ -1386,14 +1392,14 @@ sub send_message {
# supported commands
$smtp->hello($smtp_domain);
} else {
die "Server does not support STARTTLS! ".$smtp->message;
die sprintf(__("Server does not support STARTTLS! %s"), $smtp->message);
}
}
}

if (!$smtp) {
die "Unable to initialize SMTP properly. Check config and use --smtp-debug. ",
"VALUES: server=$smtp_server ",
die __("Unable to initialize SMTP properly. Check config and use --smtp-debug."),
" VALUES: server=$smtp_server ",
"encryption=$smtp_encryption ",
"hello=$smtp_domain",
defined $smtp_server_port ? " port=$smtp_server_port" : "";
Expand All @@ -1410,10 +1416,10 @@ sub send_message {
$smtp->datasend("$line") or die $smtp->message;
}
$smtp->dataend() or die $smtp->message;
$smtp->code =~ /250|200/ or die "Failed to send $subject\n".$smtp->message;
$smtp->code =~ /250|200/ or die sprintf(__("Failed to send %s\n"), $subject).$smtp->message;
}
if ($quiet) {
printf (($dry_run ? "Dry-" : "")."Sent %s\n", $subject);
printf($dry_run ? __("Dry-Sent %s\n") : __("Sent %s\n"), $subject);
} else {
print($dry_run ? __("Dry-OK. Log says:\n") : __("OK. Log says:\n"));
if (!file_name_is_absolute($smtp_server)) {
Expand Down Expand Up @@ -1443,7 +1449,7 @@ sub send_message {
$message_num = 0;

foreach my $t (@files) {
open my $fh, "<", $t or die "can't open file $t";
open my $fh, "<", $t or die sprintf(__("can't open file %s"), $t);

my $author = undef;
my $sauthor = undef;
Expand Down Expand Up @@ -1665,18 +1671,18 @@ sub recipients_cmd {

my @addresses = ();
open my $fh, "-|", "$cmd \Q$file\E"
or die "($prefix) Could not execute '$cmd'";
or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd);
while (my $address = <$fh>) {
$address =~ s/^\s*//g;
$address =~ s/\s*$//g;
$address = sanitize_address($address);
next if ($address eq $sender and $suppress_cc{'self'});
push @addresses, $address;
printf("($prefix) Adding %s: %s from: '%s'\n",
$what, $address, $cmd) unless $quiet;
printf(__("(%s) Adding %s: %s from: '%s'\n"),
$prefix, $what, $address, $cmd) unless $quiet;
}
close $fh
or die "($prefix) failed to close pipe to '$cmd'";
or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd);
return @addresses;
}

Expand Down Expand Up @@ -1730,10 +1736,10 @@ sub unique_email_list {
sub validate_patch {
my $fn = shift;
open(my $fh, '<', $fn)
or die "unable to open $fn: $!\n";
or die sprintf(__("unable to open %s: %s\n"), $fn, $!);
while (my $line = <$fh>) {
if (length($line) > 998) {
return "$.: patch contains a line longer than 998 characters";
return sprintf(__("%s: patch contains a line longer than 998 characters"), $.);
}
}
return;
Expand All @@ -1749,10 +1755,11 @@ sub handle_backup {
(substr($file, 0, $lastlen) eq $last) &&
($suffix = substr($file, $lastlen)) !~ /^[a-z0-9]/i) {
if (defined $known_suffix && $suffix eq $known_suffix) {
print "Skipping $file with backup suffix '$known_suffix'.\n";
printf(__("Skipping %s with backup suffix '%s'.\n"), $file, $known_suffix);
$skip = 1;
} else {
my $answer = ask("Do you really want to send $file? (y|N): ",
# TRANSLATORS: please keep "[y|N]" as is.
my $answer = ask(sprintf(__("Do you really want to send %s? [y|N]: "), $file),
valid_re => qr/^(?:y|n)/i,
default => 'n');
$skip = ($answer ne 'y');
Expand Down Expand Up @@ -1780,7 +1787,7 @@ sub handle_backup_files {
sub file_has_nonascii {
my $fn = shift;
open(my $fh, '<', $fn)
or die "unable to open $fn: $!\n";
or die sprintf(__("unable to open %s: %s\n"), $fn, $!);
while (my $line = <$fh>) {
return 1 if $line =~ /[^[:ascii:]]/;
}
Expand All @@ -1790,7 +1797,7 @@ sub file_has_nonascii {
sub body_or_subject_has_nonascii {
my $fn = shift;
open(my $fh, '<', $fn)
or die "unable to open $fn: $!\n";
or die sprintf(__("unable to open %s: %s\n"), $fn, $!);
while (my $line = <$fh>) {
last if $line =~ /^$/;
return 1 if $line =~ /^Subject.*[^[:ascii:]]/;
Expand Down

0 comments on commit 3c5cd20

Please sign in to comment.