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

Re: [PATCH v4 5/7] i18n: am: mark more strings for translation

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jul 25, 2012, 04:26 UTC
Message-ID
<20120725042633.GB3055@burratino>
In-Reply-To
<1493bd09efd0ba6e1d56500305d989047da245ec.1343188013.git.worldhello.net@gmail.com>
Jiang Xin wrote:
Show 11 quoted lines
> Mark strings in 'git-am.sh' for translation. In the last chunk, I
> changed '$1' to '-b/--binary' for this reason:
>
>  * First, if there is a variable in the l10n message, we could not use
>    gettext. Because the variable will be expanded (evaluated) and will
>    never match the entry in the po file.
>
>  * Second, if there is a positional parameter ($1, $2,...) in the
>    message, we could not use eval_gettext either. Because
>    eval_gettext may be a wapper for gettext, and the positional
>    parameter would loose it's original context.
Yes, I think it's a good change.
> --- a/git-am.sh
> +++ b/git-am.sh
[...]
Show 8 quoted lines
> @@ -387,8 +386,8 @@ do
>  	-i|--interactive)
>  		interactive=t ;;
>  	-b|--binary)
> -		echo >&2 "The $1 option has been a no-op for long time, and"
> -		echo >&2 "it will be removed. Please do not use it anymore."
> +		echo >&2 $(gettext "The -b/--binary option has been a no-op for long time, and
> +it will be removed. Please do not use it anymore.")
Could this be simplified to
		gettextln >&2 'The -b/--binary option...
... any more.'
or
		gettextln 'The -b/--binary option ...
... any more.' >&2

or would that confuse xgettext? That would be more comforting than "echo" because if the translated string includes backslashes then the behavior of echo can be unpredictable.

Sorry I missed that last time.
The rest is indeed
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks.
Previous: Jonathan NiederNext: Stefano Lattarini
Message 10 of 15 in “i18n for git-am, git-rebase and git-merge”
  1. 0/7 i18n for git-am, git-rebase and git-mergeJiang Xin, Jul 25, 2012
  2. 1/7 i18n: New keywords for xgettext extraction from shJiang Xin, Jul 25, 2012
  3. 2/7 i18n: rebase: mark strings for translationJiang Xin, Jul 25, 2012
  4. 3/7 i18n: Rewrite gettext messages start with dashJiang Xin, Jul 25, 2012
  5. 4/7 Remove obsolete LONG_USAGE which breaks xgettextJiang Xin, Jul 25, 2012
  6. 5/7 i18n: am: mark more strings for translationJiang Xin, Jul 25, 2012
  7. 6/7 Remove dead code which contains bad gettext blockJiang Xin, Jul 25, 2012
  8. 7/7 i18n: merge-recursive: mark strings for translationJiang Xin, Jul 25, 2012
  9. Jonathan NiederJul 25, 2012
  10. Jonathan NiederJul 25, 2012
  11. Stefano LattariniJul 25, 2012
  12. Jiang XinJul 25, 2012
  13. Jonathan NiederJul 25, 2012
  14. Jiang XinJul 25, 2012
  15. Jonathan NiederJul 25, 2012

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.