eval_gettextln does not work correctly?

eval_gettextln does not work correctly?

[Nguyen Thai Ngoc Duy]

I was running git with preloadable_libintl.so to catch unmarked
strings and I saw this

domain "git"
msgid "The copy of the patch that failed is found in:\n"
"   /home/pclouds/w/git/t/trash
directory.t4254-am-corrupt/.git/rebase-apply/patch"
msgstr ""

which means git performed a lookup on that string. It is from git-am.sh:

eval_gettextln "The copy of the patch that failed is found in:
   $dotest/patch"

I suppose it should look up "...  $dotest/patch" instead (i.e. no
variable expansion). Something is wrong here? I have a few local
patches on top of master, but none of them touches gettext shell
functions.
-- 
Duy

Re: eval_gettextln does not work correctly?

[Jonathan Nieder]

Nguyen Thai Ngoc Duy wrote:

> which means git performed a lookup on that string. It is from git-am.sh:
>
> eval_gettextln "The copy of the patch that failed is found in:
>    $dotest/patch"

Good catch.  It should use single-quotes.

[PATCH] am: quote string for translation before passing to eval_gettextln

[Nguyễn Thái Ngọc Duy]

If it's not quoted, the string is expanded before it gets looked up in
gettext database and obviously nothing is returned.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 On Wed, Aug 22, 2012 at 9:17 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
 > Nguyen Thai Ngoc Duy wrote:
 >
 >> which means git performed a lookup on that string. It is from git-am.sh:
 >>
 >> eval_gettextln "The copy of the patch that failed is found in:
 >>    $dotest/patch"
 >
 > Good catch.  It should use single-quotes.

 Yep. Verified. Also checked that no other places have this problem.
 xgettext probably detects this too. Without this patch it does not
 collect this string. With this patch, it does.

 git-am.sh | 4 ++--
 1 tập tin đã bị thay đổi, 2 được thêm vào(+), 2 bị xóa(-)

diff --git a/git-am.sh b/git-am.sh
index bd9620c..c682d34 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -855,8 +855,8 @@ did you forget to use 'git add'?"
 		eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
 		if test "$(git config --bool advice.amworkdir)" != false
 		then
-			eval_gettextln "The copy of the patch that failed is found in:
-   $dotest/patch"
+			eval_gettextln 'The copy of the patch that failed is found in:
+   $dotest/patch'
 		fi
 		stop_here_user_resolve $this
 	fi
-- 
1.7.12.rc2.18.g61b472e

Re: [PATCH] am: quote string for translation before passing to eval_gettextln

[Junio C Hamano]

Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:

> If it's not quoted, the string is expanded before it gets looked up in
> gettext database and obviously nothing is returned.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> ...
>  Yep. Verified. Also checked that no other places have this problem.
>  xgettext probably detects this too. Without this patch it does not
>  collect this string. With this patch, it does.

Will queue; thanks.

>
>  git-am.sh | 4 ++--
>  1 tập tin đã bị thay đổi, 2 được thêm vào(+), 2 bị xóa(-)
>
> diff --git a/git-am.sh b/git-am.sh
> index bd9620c..c682d34 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -855,8 +855,8 @@ did you forget to use 'git add'?"
>  		eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
>  		if test "$(git config --bool advice.amworkdir)" != false
>  		then
> -			eval_gettextln "The copy of the patch that failed is found in:
> -   $dotest/patch"
> +			eval_gettextln 'The copy of the patch that failed is found in:
> +   $dotest/patch'
>  		fi
>  		stop_here_user_resolve $this
>  	fi