From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Mar 2012 21:41:15 +0000 (-0700)
Subject: i18n: fix auto detection of gettext scheme for shell scripts
X-Git-Tag: v1.7.10-rc1~1^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac06116d44ae3738e7ad0f711074186e006a1eb5;p=git.git

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>
---

diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index d5fae993b..6a27f6813 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"