threads / patch / 29503

patchi18n: diff/apply statistics

Subject: [PATCH] i18n: diff/apply statistics

## tl;dr

5 messages between Feb 1, 2012 and Feb 3, 2012. Diffs are folded; open one to read it.

replies: 4people: 2as markdown or json

Jiang Xin· Feb 1, 2012, 17:22 UTC · lore
translate oneline statistics of diff/apply.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 builtin/apply.c |    2 +-
 diff.c          |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Show changes to 2 files +3 −3

builtin/apply.c, diff.c

diff --git a/builtin/apply.c b/builtin/apply.c
index c24d..e289e 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3241,7 +3241,7 @@ static void stat_patch_list(struct patch *patch)
 		show_stats(patch);
 	}
 
-	printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
+	printf(_(" %d files changed, %d insertions(+), %d deletions(-)\n"), files, adds, dels);
 }
 
 static void numstat_patch_list(struct patch *patch)
diff --git a/diff.c b/diff.c
index 7e1542..b9115 100644
--- a/diff.c
+++ b/diff.c
@@ -1476,7 +1476,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 	}
 	fprintf(options->file, "%s", line_prefix);
 	fprintf(options->file,
-	       " %d files changed, %d insertions(+), %d deletions(-)\n",
+	       _(" %d files changed, %d insertions(+), %d deletions(-)\n"),
 	       total_files, adds, dels);
 }
 
@@ -1507,7 +1507,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option
 				options->output_prefix_data);
 		fprintf(options->file, "%s", msg->buf);
 	}
-	fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
+	fprintf(options->file, _(" %d files changed, %d insertions(+), %d deletions(-)\n"),
 	       total_files, adds, dels);
 }
 
-- 
1.7.9.3.g1fbd7
Nguyen Thai Ngoc Duy· Feb 2, 2012, 14:40 UTC · re: Jiang Xin · lore

Re: [PATCH] i18n: diff/apply statistics

On Thu, Feb 2, 2012 at 12:22 AM, Jiang Xin <worldhello.net@gmail.com> wrote:
> translate oneline statistics of diff/apply.
There's another patch with similar goal:
http://thread.gmane.org/gmane.comp.version-control.git/189453/focus=189509
-- 
Duy
Jiang Xin· Feb 3, 2012, 01:15 UTC · re: Nguyen Thai Ngoc Duy · lore

Re: [PATCH] i18n: diff/apply statistics

2012/2/2 Nguyen Thai Ngoc Duy <pclouds@gmail.com>:
Show 6 quoted lines
> On Thu, Feb 2, 2012 at 12:22 AM, Jiang Xin <worldhello.net@gmail.com> wrote:
>> translate oneline statistics of diff/apply.
>
> There's another patch with similar goal:
>
> http://thread.gmane.org/gmane.comp.version-control.git/189453/focus=189509

It's cool, especially the call of interactive_use, so that translations for the statistics line is only for human, not for scripts/pipe...

-- Jiang Xin

Jiang Xin· Feb 3, 2012, 01:23 UTC · lore

Re: [PATCH] i18n: diff/apply statistics

2012/2/3 Nguyen Thai Ngoc Duy <pclouds@gmail.com>:
Show 12 quoted lines
> On Fri, Feb 3, 2012 at 8:12 AM, Jiang Xin <worldhello.net@gmail.com> wrote:
>> 2012/2/2 Nguyen Thai Ngoc Duy <pclouds@gmail.com>:
>>>
>>> There's another patch with similar goal:
>>>
>>> http://thread.gmane.org/gmane.comp.version-control.git/189453/focus=189509
>>
>> It's cool, especially the call of interactive_use, so that
>> translations for the statistics line is only for human, not for scripts/pipe...
>
> That's the idea but they decided to allow translations unconditionally
> in the end.
Ohh, sad, not so cool. Are there any reasons?
-- 
Jiang Xin
Nguyen Thai Ngoc Duy· Feb 3, 2012, 01:28 UTC · re: Jiang Xin · lore

Re: [PATCH] i18n: diff/apply statistics

On Fri, Feb 3, 2012 at 8:23 AM, Jiang Xin <worldhello.net@gmail.com> wrote:
Show 16 quoted lines
> 2012/2/3 Nguyen Thai Ngoc Duy <pclouds@gmail.com>:
>> On Fri, Feb 3, 2012 at 8:12 AM, Jiang Xin <worldhello.net@gmail.com> wrote:
>>> 2012/2/2 Nguyen Thai Ngoc Duy <pclouds@gmail.com>:
>>>>
>>>> There's another patch with similar goal:
>>>>
>>>> http://thread.gmane.org/gmane.comp.version-control.git/189453/focus=189509
>>>
>>> It's cool, especially the call of interactive_use, so that
>>> translations for the statistics line is only for human, not for scripts/pipe...
>>
>> That's the idea but they decided to allow translations unconditionally
>> in the end.
>
> Ohh, sad, not so cool. Are there any reasons?
>

Inconsistency mainly. I don't see anything sad about that though. You should read that thread.

-- 
Duy

← back to recent threads