threads / patch / 57713

patchi18n: fix some badly formatted i18n strings

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

## tl;dr

4 messages between Apr 11, 2022 and Apr 12, 2022. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Jean-Noël Avila via GitGitGadget· Apr 11, 2022, 19:23 UTC · lore
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(-)
Show changes to 2 files +4 −5

builtin/submodule--helper.c, git-send-email.perl

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>"),
 		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);
 			die $hook_error;
 		}
 	}

base-commit: ab1f2765f78e75ee51dface57e1071b3b7f42b09
-- 
gitgitgadget
Junio C Hamano· Apr 11, 2022, 21:14 UTC · re: Jean-Noël Avila via GitGitGadget · lore

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

"Jean-Noël Avila via GitGitGadget"  <gitgitgadget@gmail.com> writes:
Show 11 quoted lines
> 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.
Thanks.  Will queue directly on top of 'master'.
Ævar Arnfjörð Bjarmason· Apr 12, 2022, 07:59 UTC · re: Jean-Noël Avila via GitGitGadget · lore

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

On Mon, Apr 11 2022, Jean-Noël Avila via GitGitGadget wrote:
Show 30 quoted lines
> 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.
Show 18 quoted lines
>  		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;
	 		}
	 	}
Jean-Noël Avila· Apr 12, 2022, 09:03 UTC · re: Ævar Arnfjörð Bjarmason · lore

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

Le 12/04/2022 à 09:59, Ævar Arnfjörð Bjarmason a écrit :
Show 73 quoted lines
> 
> 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;
> 	 		}
> 	 	}

I wasn't sure that msgmerge would correctly handle this, but it seems so. So, yes, your version is much less invasive. Mine has an additional property of repelling developpers from trying to concatenate strings.

← back to recent threads