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

[Junio C Hamano]

Jiang Xin  writes:

> 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
>lose its original context.
>
> Also reduce one indentation level for one gettextln clause introduced
> in commit de88c1c.
>
> Signed-off-by: Jiang Xin 
> Reviewed-by: Stefano Lattarini 
> Reviewed-by: Jonathan Nieder 

Thanks. I've reworded the rationale for -b/--binary, though, as the
above sounds as if we are clueless as to how to i18n this message
properly even if we wanted to, which is not the case.

Mark strings in 'git-am.sh' for translation. In the last chunk,
change '$1' to '-b/--binary', as it is not worth turning this
message to "The %s option has been..." and using printf on it.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Jiang Xin]

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
   lose its original context.

Also reduce one indentation level for one gettextln clause introduced
in commit de88c1c.

Signed-off-by: Jiang Xin 
Reviewed-by: Stefano Lattarini 
Reviewed-by: Jonathan Nieder 
---
 git-am.sh | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 8961a..25d0e 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -92,7 +92,7 @@ safe_to_abort () {
then
return 0
fi
-   gettextln "You seem to have moved HEAD since the last 'am' 
failure.
+   gettextln "You seem to have moved HEAD since the last 'am' failure.
 Not rewinding to ORIG_HEAD" >&2
return 1
 }
@@ -136,7 +136,7 @@ fall_back_3way () {
 git write-tree >"$dotest/patch-merge-base+" ||
 cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back 
on 3-way merge.")"
 
-say Using index info to reconstruct a base tree...
+say "$(gettext "Using index info to reconstruct a base tree...")"
 
 cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
 
@@ -176,8 +176,7 @@ It does not apply to blobs recorded in its index.")"
 fi
 git-merge-recursive $orig_tree -- HEAD $his_tree || {
git rerere $allow_rerere_autoupdate
-   echo Failed to merge in the changes.
-   exit 1
+   die "$(gettext "Failed to merge in the changes.")"
 }
 unset GITHEAD_$his_tree
 }
@@ -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."
+   gettextln >&2 "The -b/--binary option has been a no-op for long 
time, and
+it will be removed. Please do not use it anymore."
;;
-3|--3way)
threeway=t ;;
-- 
1.7.12.rc0.16.gf4916ac

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html