This is v2 of the patch series that marks strings in our core shell
programs for translation. I did not have time to fix everything for
this iteration, help welcome. The way my schedule is going this
weekend I probably won't get to this before next weekend, if then.
Stuff fixed:
* Changed stuff like:
echo >&2 "$(gettext "hello there")"
to:
(
gettext "hello there" &&
echo
) >&2
It was mentioned that something like:
gettext_nl "hello_there" >&2
Would me more elegant. I agree, but didn't have time to change it
(or care that much about the style). If someone wants to change
this to whatever is the consensus that would be great.
* Better TRANSLATORS comment for git-stash.sh
As pointed out by Motiejus JakÅtys. Actually someone going through
this and adding *more* comments would improve things a lot. But
it's not strictly needed, just nice to have.
What I *didn't* fix:
* Change the eval_gettext variable names to work on win32.
This means, to quote a previous E-Mail of mine:
I'm now mostly done solving all the bugs noted in this series, aside
from the case insensitive env vars on win32 issue.
I know how to fix these, but some people may have issues with my style
of doing so, so I'd like to ask in advance to save me extra work.
Basically for code like this:
while [ $# -gt 0 ]; do
arg="$1"
case "$arg" in
--)
shift
break
;;
*)
rev=$(git rev-parse -q --verify "$arg^{commit}") || {
test $has_double_dash -eq 1 &&
die "$(eval_gettext "'\$arg' does not appear
to be a valid revision")"
break
I was thinking of just doing:
WHATEVER_arg=$arg
die "$(eval_gettext "'\$WHATEVER_arg' does not appear to be a
valid revision")"
Where WHATEVER is a sufficiently unique prefix. E.g.:
WINDOWS_ME_HARDER
GIT_I18N_VARIABLE
YOUR_MOM
DUDE_WHERES_MY_POSIX_COMPLIANCE
This series can be retrieved from:
git://github.com/avar/git.git ab/i18n-sh-only
As explained above I didn't have time to fix all the blockers. Help
would be *great* and very appreciated.
(quickly hits "send" before having to run off)
Ãvar ArnfjÃrà Bjarmason (48):
i18n: git-am add git-sh-i18n
i18n: git-am one-line gettext $msg; echo
i18n: git-am multi-line getttext $msg; echo
i18n: git-am eval_gettext messages
i18n: git-am gettext + gettext to stderr message
i18n: git-am die messages
i18n: git-am cannot_fallback messages
i18n: git-am clean_abort messages
i18n: git-am "Apply?" message
i18n: git-am "Falling back" say message
i18n: git-am core say messages
i18n: git-am printf(1) message to eval_gettext
i18n: git-pull add git-sh-i18n
i18n: git-pull die messages
i18n: git-pull eval_gettext + die message
i18n: git-pull eval_gettext + warning message
i18n: git-submodule add git-sh-i18n
i18n: git-submodule echo + eval_gettext messages
i18n: git-submodule say + eval_gettext messages
i18n: git-submodule die + eval_gettext messages
i18n: git-submodule $update_module say + die messages
i18n: git-submodule "cached cannot be used" message
i18n: git-submodule "Submodule change[...]" messages
i18n: git-submodule $errmsg messages
i18n: git-submodule "Entering [...]" message
i18n: git-submodule "[...] path is ignored" message
i18n: git-submodule "path not initialized" message
i18n: git-submodule "blob" and "submodule" messages
i18n: git-stash add git-sh-i18n
i18n: git-stash echo + gettext message
i18n: git-stash say + gettext messages
i18n: git-stash die + gettext messages
i18n: git-stash die + eval_gettext messages
i18n: git-stash die + eval_gettext $* messages
i18n: git-stash die + eval_gettext $1 messages
i18n: git-stash "unknown option" message
i18n: git-stash drop_stash say/die messages
i18n: git-bisect add git-sh-i18n
i18n: git-bisect gettext + echo message
i18n: git-bisect echo + gettext messages
i18n: git-bisect echo + eval_gettext message
i18n: git-bisect die + gettext messages
i18n: git-bisect die + eval_gettext messages
i18n: git-bisect bisect_run + $@ messages
i18n: git-bisect bisect_reset + $1 messages
i18n: git-bisect bisect_replay + $1 messages
i18n: git-bisect [Y/n] messages
i18n: git-bisect bisect_next_check "You need to" message
git-am.sh | 77 ++++++++++++++++-------------
git-bisect.sh | 113 +++++++++++++++++++++++++++---------------
git-pull.sh | 34 +++++++------
git-stash.sh | 81 ++++++++++++++++++++----------
git-submodule.sh | 98 ++++++++++++++++++++-----------------
t/t4150-am.sh | 2 +-
t/t4151-am-abort.sh | 5 +-
t/t7400-submodule-basic.sh | 4 +-
t/t7401-submodule-summary.sh | 12 ++--
t/t7406-submodule-update.sh | 2 +-
t/t7407-submodule-foreach.sh | 4 +-
11 files changed, 255 insertions(+), 177 deletions(-)
--
1.7.5.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html