Re: [PATCH v3 5/7] i18n: am: mark more strings for translation
Junio C Hamano writes: > Jonathan Nieder writes: > >> Before this patch, it says >> >> The --binary option has been a no-op for a long time, and ... >> >> After the patch, it says >> >> The -b option has been a no-op for a long time, and ... >> >> Intentional? That may be a good change or a bad one (I haven't >> thought clearly about it), but it seems at least worth mentioning. >> Cc-ing Thomas in case he has advice. > > If we really care we could printf $1, but I think we usually do > > The -b/--binary option has been... > > in a case like this, especially in codepaths that no longer has an > easy access to $1 after parsing the command line but knows that > either one of them is given from the parse result, and that would be > an appropriate solution for this particular one as well. Yes. The original plan was to free up -b, but since we don't need --binary any more either, it's better if we can get rid of it the same way. -- Thomas Rast trast@{inf,student}.ethz.ch -- 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 v3 5/7] i18n: am: mark more strings for translation
2012/7/25 Jonathan Nieder : >> -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 option has been a no-op for long >> time, and >> +it will be removed. Please do not use it anymore.") > > ... that this changes the message when the --binary option is passed. > Before this patch, it says > > The --binary option has been a no-op for a long time, and ... > > After the patch, it says > > The -b option has been a no-op for a long time, and ... > > Intentional? That may be a good change or a bad one (I haven't > thought clearly about it), but it seems at least worth mentioning. > Cc-ing Thomas in case he has advice. It's intentional. * First, if a variable in the message, we could not use gettext, for the variable will be expanded (evaluated) and never match the entry in 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. -- 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
Re: [PATCH v3 5/7] i18n: am: mark more strings for translation
Jonathan Nieder writes: >> -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 option has been a no-op for long >> time, and >> +it will be removed. Please do not use it anymore.") > > ... that this changes the message when the --binary option is passed. > Before this patch, it says > > The --binary option has been a no-op for a long time, and ... > > After the patch, it says > > The -b option has been a no-op for a long time, and ... > > Intentional? That may be a good change or a bad one (I haven't > thought clearly about it), but it seems at least worth mentioning. > Cc-ing Thomas in case he has advice. If we really care we could printf $1, but I think we usually do The -b/--binary option has been... in a case like this, especially in codepaths that no longer has an easy access to $1 after parsing the command line but knows that either one of them is given from the parse result, and that would be an appropriate solution for this particular one as well. -- 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 v3 5/7] i18n: am: mark more strings for translation
Hi, Jiang Xin wrote: > Mark additional 3 strings for translation, and reduce one indentation > level for one gettextln clause introduced in commit de88c1c. The above description doesn't mention: [...] > @@ -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 option has been a no-op for long > time, and > +it will be removed. Please do not use it anymore.") ... that this changes the message when the --binary option is passed. Before this patch, it says The --binary option has been a no-op for a long time, and ... After the patch, it says The -b option has been a no-op for a long time, and ... Intentional? That may be a good change or a bad one (I haven't thought clearly about it), but it seems at least worth mentioning. Cc-ing Thomas in case he has advice. Thanks, Jonathan -- 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 v3 5/7] i18n: am: mark more strings for translation
Mark additional 3 strings for translation, and reduce one indentation level for one gettextln clause introduced in commit de88c1c. Signed-off-by: Jiang Xin Reviewed-by: Stefano Lattarini --- git-am.sh | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/git-am.sh b/git-am.sh index c02e6..b7183 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 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.17.gcb766d3 -- 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