From: Junio C Hamano <gitster@pobox.com>
To: Dragan Simic <dsimic@manjaro.org>
Cc: git@vger.kernel.org, code@khaugsbakk.name
Subject: Re: [PATCH v6 1/2] send-email: move newline characters out of a few translatable strings
Date: Wed, 10 Apr 2024 09:12:23 -0700 [thread overview]
Message-ID: <xmqqr0fdw61k.fsf@gitster.g> (raw)
In-Reply-To: <29ea3a9b07bf1aa17b5d6a1e41325379c494bcb2.1712732383.git.dsimic@manjaro.org> (Dragan Simic's message of "Wed, 10 Apr 2024 09:01:29 +0200")
Dragan Simic <dsimic@manjaro.org> writes:
> Move the already existing newline characters out of a few translatable
> strings, to help a bit with the translation efforts.
>
> Signed-off-by: Dragan Simic <dsimic@manjaro.org>
> ---
> git-send-email.perl | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
Looking good. Thanks for spotting similar issues and fixing them at
the same time.
> diff --git a/git-send-email.perl b/git-send-email.perl
> index 821b2b3a135a..f0be4b4560f7 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -1664,9 +1664,11 @@ sub send_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") : __("Sent %s\n"), $subject);
> + printf($dry_run ? __("Dry-Sent %s") : __("Sent %s"), $subject);
> + print "\n";
> } 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)) {
> print "Server: $smtp_server\n";
> print "MAIL FROM:<$raw_from>\n";
> @@ -1686,10 +1688,11 @@ sub send_message {
> print $header, "\n";
> if ($smtp) {
> print __("Result: "), $smtp->code, ' ',
> - ($smtp->message =~ /\n([^\n]+\n)$/s), "\n";
> + ($smtp->message =~ /\n([^\n]+\n)$/s);
> } else {
> - print __("Result: OK\n");
> + print __("Result: OK");
> }
> + print "\n";
> }
>
> return 1;
next prev parent reply other threads:[~2024-04-10 16:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 7:01 [PATCH v6 0/2] send-email: make produced outputs more readable Dragan Simic
2024-04-10 7:01 ` [PATCH v6 1/2] send-email: move newline characters out of a few translatable strings Dragan Simic
2024-04-10 16:12 ` Junio C Hamano [this message]
2024-04-13 6:12 ` Dragan Simic
2024-04-10 7:01 ` [PATCH v6 2/2] send-email: make it easy to discern the messages for each patch Dragan Simic
2024-04-10 16:28 ` Junio C Hamano
2024-04-10 22:59 ` Eric Sunshine
2024-04-13 6:10 ` Dragan Simic
2024-04-13 6:27 ` Dragan Simic
2024-04-27 17:27 ` Dragan Simic
2024-04-27 17:41 ` Junio C Hamano
2024-04-27 17:49 ` Dragan Simic
2024-04-27 18:06 ` Junio C Hamano
2024-04-27 18:18 ` Junio C Hamano
2024-04-28 3:03 ` Dragan Simic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr0fdw61k.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=code@khaugsbakk.name \
--cc=dsimic@manjaro.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.