Re: [PATCH v6 1/2] send-email: move newline characters out of a few translatable strings

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 10, 2024, 16:12 UTC
Message-ID: <xmqqr0fdw61k.fsf@gitster.g>
In-Reply-To: <29ea3a9b07bf1aa17b5d6a1e41325379c494bcb2.1712732383.git.dsimic@manjaro.org>

Dragan Simic <dsimic@manjaro.org> writes:

Show 7 quoted lines

> 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.

Show 32 quoted lines

> 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;