Re: [PATCH v4 5/7] i18n: am: mark more strings for translation
Sorry to be so nit-picky, but ... On 07/25/2012 05:53 AM, Jiang Xin wrote: 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. ... here you should s/it's/its/. Regards, Stefano -- 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
Re: [PATCH v4 5/7] i18n: am: mark more strings for translation
2012/7/25 Stefano Lattarini stefano.lattar...@gmail.com: * 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. ... here you should s/it's/its/. OMG. You find what some grammer/spelling checking website hasn't. If there are no other serious problems, I won't make noises (send another series of patches) to this list, should I? -- Jiang Xin -- 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 v4 5/7] i18n: am: mark more strings for translation
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.
Also reduce one indentation level for one gettextln clause introduced
in commit de88c1c.
Signed-off-by: Jiang Xin worldhello@gmail.com
Reviewed-by: Stefano Lattarini stefano.lattar...@gmail.com
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
---
git-am.sh | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 8961a..3f654 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.
+ 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.)
;;
-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
Re: [PATCH v4 5/7] i18n: am: mark more strings for translation
Jiang Xin wrote: 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 [...] @@ -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 jrnie...@gmail.com Thanks. -- 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
