{"thread":{"id":"30607","subject":"[PATCH] Collocate strings to simplify translation","startedAt":"2012-05-24T07:41:28Z","lastAt":"2012-05-24T12:34:01Z","messageCount":5,"participants":["Vincent van Ravesteijn","Zbigniew Jędrzejewski-Szmek","Johannes Sixt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"192055","messageId":"1337845288-7656-1-git-send-email-vfr@lyx.org","threadId":"30607","inReplyTo":null,"subject":"[PATCH] Collocate strings to simplify translation","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2012-05-24T07:41:28Z","receivedAt":"2012-05-24T07:41:28Z","isPatch":true,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"The translation of 'Untracked' and 'Ignored' might depend on the following\nword. To help the translator, this patch collocates the term 'files'.\n\nSigned-off-by: Vincent van Ravesteijn <vfr@lyx.org>\n---\n wt-status.c |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/wt-status.c b/wt-status.c\nindex dd6d8c4..9b65a8c 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -185,7 +185,7 @@ static void wt_status_print_other_header(struct wt_status *s,\n \t\t\t\t\t const char *how)\n {\n \tconst char *c = color(WT_STATUS_HEADER, s);\n-\tstatus_printf_ln(s, c, _(\"%s files:\"), what);\n+\tstatus_printf_ln(s, c, _(\"%s:\"), what);\n \tif (!advice_status_hints)\n \t\treturn;\n \tstatus_printf_ln(s, c, _(\"  (use \\\"git %s <file>...\\\" to include in what will be committed)\"), how);\n@@ -766,9 +766,9 @@ void wt_status_print(struct wt_status *s)\n \t\twt_status_print_submodule_summary(s, 1);  /* unstaged */\n \t}\n \tif (s->show_untracked_files) {\n-\t\twt_status_print_other(s, &s->untracked, _(\"Untracked\"), \"add\");\n+\t\twt_status_print_other(s, &s->untracked, _(\"Untracked files\"), \"add\");\n \t\tif (s->show_ignored_files)\n-\t\t\twt_status_print_other(s, &s->ignored, _(\"Ignored\"), \"add -f\");\n+\t\t\twt_status_print_other(s, &s->ignored, _(\"Ignored files\"), \"add -f\");\n \t} else if (s->commitable)\n \t\tstatus_printf_ln(s, GIT_COLOR_NORMAL, _(\"Untracked files not listed%s\"),\n \t\t\tadvice_status_hints\n-- \n1.7.9.msysgit.0\n"},{"id":"192056","messageId":"4FBDF21F.1010807@in.waw.pl","threadId":"30607","inReplyTo":"1337845288-7656-1-git-send-email-vfr@lyx.org","subject":"Re: [PATCH] Collocate strings to simplify translation","fromName":"Zbigniew Jędrzejewski-Szmek","fromEmail":"zbyszek@in.waw.pl","sentAt":"2012-05-24T08:32:31Z","receivedAt":"2012-05-24T08:32:31Z","isPatch":true,"sender":{"key":"zbyszek@in.waw.pl","avatar":"https://avatars.githubusercontent.com/u/349618?v=4"},"body":"On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:\n> The translation of 'Untracked' and 'Ignored' might depend on the following\n> word. To help the translator, this patch collocates the term 'files'.\n> \n> Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>\n> ---\n>  wt-status.c |    6 +++---\n>  1 files changed, 3 insertions(+), 3 deletions(-)\n> \n> diff --git a/wt-status.c b/wt-status.c\n> index dd6d8c4..9b65a8c 100644\n> --- a/wt-status.c\n> +++ b/wt-status.c\n> @@ -185,7 +185,7 @@ static void wt_status_print_other_header(struct wt_status *s,\n>  \t\t\t\t\t const char *how)\n>  {\n>  \tconst char *c = color(WT_STATUS_HEADER, s);\n> -\tstatus_printf_ln(s, c, _(\"%s files:\"), what);\n> +\tstatus_printf_ln(s, c, _(\"%s:\"), what);\nHow can \"%s:\" be translated? _() should be removed here.\n\n>  \tif (!advice_status_hints)\n>  \t\treturn;\n>  \tstatus_printf_ln(s, c, _(\"  (use \\\"git %s <file>...\\\" to include in what will be committed)\"), how);\n> @@ -766,9 +766,9 @@ void wt_status_print(struct wt_status *s)\n>  \t\twt_status_print_submodule_summary(s, 1);  /* unstaged */\n>  \t}\n>  \tif (s->show_untracked_files) {\n> -\t\twt_status_print_other(s, &s->untracked, _(\"Untracked\"), \"add\");\n> +\t\twt_status_print_other(s, &s->untracked, _(\"Untracked files\"), \"add\");\n>  \t\tif (s->show_ignored_files)\n> -\t\t\twt_status_print_other(s, &s->ignored, _(\"Ignored\"), \"add -f\");\n> +\t\t\twt_status_print_other(s, &s->ignored, _(\"Ignored files\"), \"add -f\");\nThis part is looks sensible.\n\n>  \t} else if (s->commitable)\n>  \t\tstatus_printf_ln(s, GIT_COLOR_NORMAL, _(\"Untracked files not listed%s\"),\n>  \t\t\tadvice_status_hints\n\nZbyszek\n"},{"id":"192058","messageId":"4FBE0593.7070205@lyx.org","threadId":"30607","inReplyTo":"4FBDF21F.1010807@in.waw.pl","subject":"Re: [PATCH] Collocate strings to simplify translation","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2012-05-24T09:55:31Z","receivedAt":"2012-05-24T09:55:31Z","isPatch":true,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"Op 24-5-2012 10:32, Zbigniew Jędrzejewski-Szmek schreef:\n> On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:\n>> The translation of 'Untracked' and 'Ignored' might depend on the following\n>> word. To help the translator, this patch collocates the term 'files'.\n>>\n>> Signed-off-by: Vincent van Ravesteijn<vfr@lyx.org>\n>> ---\n>>   wt-status.c |    6 +++---\n>>   1 files changed, 3 insertions(+), 3 deletions(-)\n>>\n>> diff --git a/wt-status.c b/wt-status.c\n>> index dd6d8c4..9b65a8c 100644\n>> --- a/wt-status.c\n>> +++ b/wt-status.c\n>> @@ -185,7 +185,7 @@ static void wt_status_print_other_header(struct wt_status *s,\n>>   \t\t\t\t\t const char *how)\n>>   {\n>>   \tconst char *c = color(WT_STATUS_HEADER, s);\n>> -\tstatus_printf_ln(s, c, _(\"%s files:\"), what);\n>> +\tstatus_printf_ln(s, c, _(\"%s:\"), what);\n> How can \"%s:\" be translated? _() should be removed here.\n\nSome languages might use a character different from ':'. For example, \nChinese uses a full-width character ':' (unicode 0xFF1A) instead of a \nhalf-width character. Maybe this is taken care of by the system/shell or \nwhatever, maybe not. Other examples are languages that read from right \nto left. I guess it should then be translated by \":%s\".\n\nThis will probably be a matter of convention.\n\nVincent\n"},{"id":"192063","messageId":"4FBE2797.80505@viscovery.net","threadId":"30607","inReplyTo":"4FBE0593.7070205@lyx.org","subject":"Re: [PATCH] Collocate strings to simplify translation","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2012-05-24T12:20:39Z","receivedAt":"2012-05-24T12:20:39Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 5/24/2012 11:55, schrieb Vincent van Ravesteijn:\n> Op 24-5-2012 10:32, Zbigniew Jędrzejewski-Szmek schreef:\n>> On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:\n>>> -    status_printf_ln(s, c, _(\"%s files:\"), what);\n>>> +    status_printf_ln(s, c, _(\"%s:\"), what);\n>> How can \"%s:\" be translated? _() should be removed here.\n> \n> Some languages might use a character different from ':'. For example,\n> Chinese uses a full-width character ':' (unicode 0xFF1A) instead of a\n> half-width character. Maybe this is taken care of by the system/shell or\n> whatever, maybe not. Other examples are languages that read from right to\n> left. I guess it should then be translated by \":%s\".\n> \n> This will probably be a matter of convention.\n\nShouldn't you then move the colon with the \"files\"? That is, here we have:\n\n-\tstatus_printf_ln(s, c, _(\"%s files:\"), what);\n+\tstatus_printf_ln(s, c, \"%s\", what);\n\nand elsewhere we use _(\"Untracked files:\") and _(\"Ignored files:\").\n\n-- Hannes\n"},{"id":"192064","messageId":"4FBE2AB9.6010502@lyx.org","threadId":"30607","inReplyTo":"4FBE2797.80505@viscovery.net","subject":"Re: [PATCH] Collocate strings to simplify translation","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2012-05-24T12:34:01Z","receivedAt":"2012-05-24T12:34:01Z","isPatch":true,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"Op 24-5-2012 14:20, Johannes Sixt schreef:\n> Am 5/24/2012 11:55, schrieb Vincent van Ravesteijn:\n>> Op 24-5-2012 10:32, Zbigniew Jędrzejewski-Szmek schreef:\n>>> On 05/24/2012 09:41 AM, Vincent van Ravesteijn wrote:\n>>>> -    status_printf_ln(s, c, _(\"%s files:\"), what);\n>>>> +    status_printf_ln(s, c, _(\"%s:\"), what);\n>>> How can \"%s:\" be translated? _() should be removed here.\n>> Some languages might use a character different from ':'. For example,\n>> Chinese uses a full-width character ':' (unicode 0xFF1A) instead of a\n>> half-width character. Maybe this is taken care of by the system/shell or\n>> whatever, maybe not. Other examples are languages that read from right to\n>> left. I guess it should then be translated by \":%s\".\n>>\n>> This will probably be a matter of convention.\n> Shouldn't you then move the colon with the \"files\"? That is, here we have:\n>\n> -\tstatus_printf_ln(s, c, _(\"%s files:\"), what);\n> +\tstatus_printf_ln(s, c, \"%s\", what);\n>\n> and elsewhere we use _(\"Untracked files:\") and _(\"Ignored files:\").\n\nI would avoid having too many 'decorations' in the strings themselves, \nbecause it is annoying to have to translate \"Untracked files\", \n\"untracked files\", \"untracked files:\", \"  (untracked files)\" etc.\n\nBesides, the translation of \"%s:\" can be reused numerous times.\n\nJust my opinion.\n\nVincent\n"}]}