Re: [PATCH v2 2/7] i18n: rebase: mark strings for translation

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 22, 2012, 19:04 UTC
Message-ID: <7vhaszr31r.fsf@alter.siamese.dyndns.org>
In-Reply-To: <724ca3989123159c9970b3276b4764dcbd5fd56e.1342920089.git.worldhello.net@gmail.com>

Jiang Xin <worldhello.net@gmail.com> writes:

Show 7 quoted lines

> -resolvemsg="
> +resolvemsg="$(gettext "
>  When you have resolved this problem run \"git rebase --continue\".
>  If you would prefer to skip this patch, instead run \"git rebase --skip\".
>  To check out the original branch and stop rebasing run \"git rebase --abort\".
> -"
> +")"

Two micronits:

 - A="B" assignment can lose the outermost dq-pair around it
   (i.e. A=B), which might make the above easier to read.

 - The original message had to backslash-quote only because the
   outermost quote was done with a dq-pair, but it does not use any
   substitutions, so turning it into a sq-pair might make the above
   easier to read.

With "might", I am not saying the above should be _fixed_; I am merely saying we may want to consider these points to see if some changes to your patch are improvements.

    resolvemsg=$(gettext '
    When you have resolved this problem run "git rebase --continue".
    If you would prefer to skip this patch, instead run "git rebase --skip".
    To check out the original branch and stop rebasing run "git rebase --abort".
    ')

Show 6 quoted lines

> @@ -316,12 +317,12 @@ test $# -gt 2 && usage
>  if test -n "$cmd" &&
>     test "$interactive_rebase" != explicit
>  then
> -	die "--exec option must be used with --interactive option"
> +	die "$(gettext -- "--exec option must be used with --interactive option")"

This is a related tangent, but have we resolved that issue with xgettext and "--"?

Ahh, I see you did something in [3/7] ;-)

Thanks.