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

Merge branch 'ds/send-email-per-message-block'

Browse Source 
Preliminary code clean-up for "git send-email".

* ds/send-email-per-message-block:
  send-email: move newline characters out of a few translatable strings
This commit is contained in:
Junio C Hamano
2024-05-28 11:17:09 -07:00
parent 7a40196328 c02dc38570
commit 789ec1d91d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
git-send-email.perl
View File

@ -1664,9 +1664,11 @@ EOF
$smtp->code =~ /250|200/ or die sprintf(__("Failed to send %s\n"), $subject).$smtp->message; $smtp->code =~ /250|200/ or die sprintf(__("Failed to send %s\n"), $subject).$smtp->message;
} }
if ($quiet) { if ($quiet) {
printf($dry_run ? __("Dry-Sent %s\n") : __("Sent %s\n"), $subject); printf($dry_run ? __("Dry-Sent %s") : __("Sent %s"), $subject);
print "\n";
} else { } else {
print($dry_run ? __("Dry-OK. Log says:\n") : __("OK. Log says:\n")); print($dry_run ? __("Dry-OK. Log says:") : __("OK. Log says:"));
print "\n";
if (!defined $sendmail_cmd && !file_name_is_absolute($smtp_server)) { if (!defined $sendmail_cmd && !file_name_is_absolute($smtp_server)) {
print "Server: $smtp_server\n"; print "Server: $smtp_server\n";
print "MAIL FROM:<$raw_from>\n"; print "MAIL FROM:<$raw_from>\n";
@ -1686,10 +1688,11 @@ EOF
print $header, "\n"; print $header, "\n";
if ($smtp) { if ($smtp) {
print __("Result: "), $smtp->code, ' ', print __("Result: "), $smtp->code, ' ',
($smtp->message =~ /\n([^\n]+\n)$/s), "\n"; ($smtp->message =~ /\n([^\n]+\n)$/s);
} else { } else {
print __("Result: OK\n"); print __("Result: OK");
} }
print "\n";
} }
return 1; return 1;