summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-12 21:41:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-12 21:41:15 (GMT)
commitac06116d44ae3738e7ad0f711074186e006a1eb5 (patch)
tree6f7f3e50ec3d06d1c559481ce48d6238d2699325
parent745950ce0e7e984158a00cd52c5811918d1f3495 (diff)
downloadgit-ac06116d44ae3738e7ad0f711074186e006a1eb5.zip
git-ac06116d44ae3738e7ad0f711074186e006a1eb5.tar.gz
git-ac06116d44ae3738e7ad0f711074186e006a1eb5.tar.bz2
i18n: fix auto detection of gettext scheme for shell scripts
A new code added by ad17ea7 (add a Makefile switch to avoid gettext translation in shell scripts, 2012-01-23) tried to optionally force a gettext scheme to "fallthrough", but ended up forcing it to everybody. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git-sh-i18n.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index d5fae99..6a27f68 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -21,7 +21,7 @@ GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
if test -n "@@USE_GETTEXT_SCHEME@@"
then
GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
-elif test -n "@@USE_FALLTHROUGH_GETTEXT_SCHEME@@$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
then
: no probing necessary
elif test -n "$GIT_GETTEXT_POISON"