Re: [PATCH] i18n: fix some badly formatted i18n strings

> 
> On Mon, Apr 11 2022, Jean-Noël Avila via GitGitGadget wrote:
> 
>> From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
>>
>> String in submodule--helper is not correctly formatting
>> placeholders. The string in git-send-email is partial.
>>
>> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
>> ---
>>      V2.36 i18n fixes
>>      
>>      While translating the latest version of the messages, I encountered a
>>      few errors of formatting or management.
>>
>> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1212%2Fjnavila%2Fv2.36_i18n_fixes-v1
>> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1212/jnavila/v2.36_i18n_fixes-v1
>> Pull-Request: https://github.com/gitgitgadget/git/pull/1212
>>
>>   builtin/submodule--helper.c | 2 +-
>>   git-send-email.perl         | 7 +++----
>>   2 files changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
>> index 0b8b226c8ff..2c87ef9364f 100644
>> --- a/builtin/submodule--helper.c
>> +++ b/builtin/submodule--helper.c
>> @@ -3082,7 +3082,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix)
>>   		OPT_END()
>>   	};
>>   	const char *const usage[] = {
>> -		N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>"),
>> +		N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"),
> 
> Okey, so s/_/-/g here.
> 
>>   		NULL
>>   	};
>>   
>> diff --git a/git-send-email.perl b/git-send-email.perl
>> index a98460bdb96..5861e99a6eb 100755
>> --- a/git-send-email.perl
>> +++ b/git-send-email.perl
>> @@ -2096,10 +2096,9 @@ sub validate_patch {
>>   			chdir($cwd_save) or die("chdir: $!");
>>   		}
>>   		if ($hook_error) {
>> -			$hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" .
>> -						 $hook_error . "\n" .
>> -						 "warning: no patches were sent\n"),
>> -					      $fn, $hook_name);
>> +			$hook_error = sprintf(
>> +			    __("fatal: %s: rejected by %s hook\n%s\nwarning: no patches were sent\n"),
>> +			    $fn, $hook_name, $hook_error);
> 
> Isn't this much narrower change going to do the same thing?:
> 	
> 	diff --git a/git-send-email.perl b/git-send-email.perl
> 	index a98460bdb96..5adb7593ce3 100755
> 	--- a/git-send-email.perl
> 	+++ b/git-send-email.perl
> 	@@ -2097,9 +2097,9 @@ sub validate_patch {
> 	 		}
> 	 		if ($hook_error) {
> 	 			$hook_error = sprintf(__("fatal: %s: rejected by %s hook\n" .
> 	-						 $hook_error . "\n" .
> 	+						 "%s\n" .
> 	 						 "warning: no patches were sent\n"),
> 	-					      $fn, $hook_name);
> 	+					      $fn, $hook_name, $hook_error);
> 	 			die $hook_error;
> 	 		}
> 	 	}