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

Re: [PATCH v2 4/7] i18n: builtin/pull.c: mark strings for translation

From
Duy Nguyen <pclouds@gmail.com>
Date
Apr 12, 2016, 09:52 UTC
Message-ID
<CACsJy8BsxZTChST8Gb25LT1HwwR1AcAthjfOQmoAjxkF4qzvBw@mail.gmail.com>
In-Reply-To
<570B7FCD.5050809@sapo.pt>
On Mon, Apr 11, 2016 at 5:43 PM, Vasco Almeida <vascomalmeida@sapo.pt> wrote:
Show 37 quoted lines
>>> @@ -458,13 +458,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
>>>                      fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
>>>              fprintf_ln(stderr, _("See git-pull(1) for details."));
>>>              fprintf(stderr, "\n");
>>> -            fprintf_ln(stderr, "    git pull <remote> <branch>");
>>> +            fprintf_ln(stderr, "    git pull <%s> <%s>", _("remote"), _("branch"));
>>
>> I know this hunk follows I suggested, i.e. "quotes around a
>> placeholder is universal and locale independent".  However, ...
>>
>>>              fprintf(stderr, "\n");
>>>      } else if (!curr_branch->merge_nr) {
>>>              const char *remote_name = NULL;
>>>
>>>              if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
>>> -                    remote_name = "<remote>";
>>> +                    remote_name = _("<remote>");
>>>
>> ... this does not.  It allows to translate the "quote around a
>> placeholder".  And where this phony "remote_name" string is used,
>> there is also this reference to <branch>:
>>
>>     fprintf_ln(stderr, _("If you wish to set tracking information for ..."
>>                     "\n"
>>                     "    git branch --set-upstream-to=%s/<branch> %s\n"),
>>                     remote_name, curr_branch->name);
>>
>> which also does.
>>
>> Perhaps the first hunk at around ll.458 would want to do
>>
>>> +    fprintf_ln(stderr, "    git pull %s %s", _("<remote>"), _("<branch>"));
>>
>> to be consistent and more flexible for the translator's needs?  The
>> quoting convention may be locale dependent after all.
>>
> If we think placeholders quoting is important for localization,

Ex-translator speaking. Context is important. If it's me, I would even go as far as marking the whole line translatable just to give more context (it's mostly just copy and translate a few words then). But then again, I was half developer half translator and may see things a bit differently. Maybe _("<remote>") is a good balance.

-- 
Duy
Previous: Vasco AlmeidaNext: Jean-Noël Avila
Message 8 of 12 in “i18n: index-pack: use plural string instead of normal one”
  1. 1/7 i18n: index-pack: use plural string instead of normal oneVasco Almeida, Apr 9, 2016
  2. 2/7 i18n: unpack-trees: mark strings for translationVasco Almeida, Apr 9, 2016
  3. 3/7 i18n: git-parse-remote.sh: mark strings for translationVasco Almeida, Apr 9, 2016
  4. Junio C HamanoApr 12, 2016
  5. 4/7 i18n: builtin/pull.c: mark strings for translationVasco Almeida, Apr 9, 2016
  6. Junio C HamanoApr 10, 2016
  7. Vasco AlmeidaApr 11, 2016
  8. Duy NguyenApr 12, 2016
  9. Jean-Noël AvilaApr 29, 2016
  10. 5/7 i18n: builtin/pull.c: split strings marked for translationVasco Almeida, Apr 9, 2016
  11. 6/7 i18n: builtin/rm.c: remove a comma ',' from stringVasco Almeida, Apr 9, 2016
  12. 7/7 i18n: builtin/branch.c: mark option for translationVasco Almeida, Apr 9, 2016

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.