git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
DSDragan Simic <dsimic@manjaro.org>
Date
Apr 13, 2024, 06:12 UTC
Message-ID
<5e3e714dcbbcd0d44a035e34b922e01a@manjaro.org>
In-Reply-To
<xmqqr0fdw61k.fsf@gitster.g>
Hello Junio,
On 2024-04-10 18:12, Junio C Hamano wrote:
Show 12 quoted lines
> 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.
I'm glad that you like it.
Show 35 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;
Previous: Junio C HamanoNext: Dragan Simic
Message 4 of 15 in “send-email: make produced outputs more readable”
  1. 0/2 send-email: make produced outputs more readableDragan Simic, Apr 10, 2024
  2. 1/2 send-email: move newline characters out of a few translatable stringsDragan Simic, Apr 10, 2024
  3. Junio C HamanoApr 10, 2024
  4. Dragan SimicApr 13, 2024
  5. 2/2 send-email: make it easy to discern the messages for each patchDragan Simic, Apr 10, 2024
  6. Junio C HamanoApr 10, 2024
  7. Eric SunshineApr 10, 2024
  8. Dragan SimicApr 13, 2024
  9. Dragan SimicApr 13, 2024
  10. Dragan SimicApr 27, 2024
  11. Junio C HamanoApr 27, 2024
  12. Dragan SimicApr 27, 2024
  13. Junio C HamanoApr 27, 2024
  14. Junio C HamanoApr 27, 2024
  15. Dragan SimicApr 28, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.