diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-14 13:47:44 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-05-14 20:29:11 -0700 |
| commit | 64a42951471b03c0e25f9e632973e17e2cc2a758 (patch) | |
| tree | b3055f0ae6e121d20f0879b09f807d999e7d613a | |
| parent | git-sh-i18n.sh: add no-op gettext() and eval_gettext() wrappers (diff) | |
| download | tgif-64a42951471b03c0e25f9e632973e17e2cc2a758.tar.xz | |
git-sh-i18n.sh: add GIT_GETTEXT_POISON support
Change git-sh-i18n.sh to support the GIT_GETTEXT_POISON environment
variable like gettext.c does, this ensures that tests that use
git-sh-i18n.sh will fail under GETTEXT_POISON=YesPlease if they rely
on Git's C locale messages without declaring that they do.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git-sh-i18n.sh | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh index ea05e16b19..32ca59de82 100644 --- a/git-sh-i18n.sh +++ b/git-sh-i18n.sh @@ -5,13 +5,25 @@ # This is a skeleton no-op implementation of gettext for Git. It'll be # replaced by something that uses gettext.sh in a future patch series. -gettext () { - printf "%s" "$1" -} +if test -z "$GIT_GETTEXT_POISON" +then + gettext () { + printf "%s" "$1" + } + + eval_gettext () { + printf "%s" "$1" | ( + export PATH $(git sh-i18n--envsubst --variables "$1"); + git sh-i18n--envsubst "$1" + ) + } +else + gettext () { + printf "%s" "# GETTEXT POISON #" + } + + eval_gettext () { + printf "%s" "# GETTEXT POISON #" + } +fi -eval_gettext () { - printf "%s" "$1" | ( - export PATH $(git sh-i18n--envsubst --variables "$1"); - git sh-i18n--envsubst "$1" - ) -} |