Skip to content

Commit 789ec1d

Browse files
committed
Merge branch 'ds/send-email-per-message-block'
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
2 parents 7a40196 + c02dc38 commit 789ec1d

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

git-send-email.perl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,9 +1664,11 @@ sub send_message {
16641664
$smtp->code =~ /250|200/ or die sprintf(__("Failed to send %s\n"), $subject).$smtp->message;
16651665
}
16661666
if ($quiet) {
1667-
printf($dry_run ? __("Dry-Sent %s\n") : __("Sent %s\n"), $subject);
1667+
printf($dry_run ? __("Dry-Sent %s") : __("Sent %s"), $subject);
1668+
print "\n";
16681669
} else {
1669-
print($dry_run ? __("Dry-OK. Log says:\n") : __("OK. Log says:\n"));
1670+
print($dry_run ? __("Dry-OK. Log says:") : __("OK. Log says:"));
1671+
print "\n";
16701672
if (!defined $sendmail_cmd && !file_name_is_absolute($smtp_server)) {
16711673
print "Server: $smtp_server\n";
16721674
print "MAIL FROM:<$raw_from>\n";
@@ -1686,10 +1688,11 @@ sub send_message {
16861688
print $header, "\n";
16871689
if ($smtp) {
16881690
print __("Result: "), $smtp->code, ' ',
1689-
($smtp->message =~ /\n([^\n]+\n)$/s), "\n";
1691+
($smtp->message =~ /\n([^\n]+\n)$/s);
16901692
} else {
1691-
print __("Result: OK\n");
1693+
print __("Result: OK");
16921694
}
1695+
print "\n";
16931696
}
16941697

16951698
return 1;

0 commit comments

Comments
 (0)