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>maint
parent
e00cf070a4
commit
64a4295147
|
@ -5,13 +5,25 @@
|
||||||
# This is a skeleton no-op implementation of gettext for Git. It'll be
|
# 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.
|
# replaced by something that uses gettext.sh in a future patch series.
|
||||||
|
|
||||||
gettext () {
|
if test -z "$GIT_GETTEXT_POISON"
|
||||||
|
then
|
||||||
|
gettext () {
|
||||||
printf "%s" "$1"
|
printf "%s" "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
eval_gettext () {
|
eval_gettext () {
|
||||||
printf "%s" "$1" | (
|
printf "%s" "$1" | (
|
||||||
export PATH $(git sh-i18n--envsubst --variables "$1");
|
export PATH $(git sh-i18n--envsubst --variables "$1");
|
||||||
git sh-i18n--envsubst "$1"
|
git sh-i18n--envsubst "$1"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
gettext () {
|
||||||
|
printf "%s" "# GETTEXT POISON #"
|
||||||
|
}
|
||||||
|
|
||||||
|
eval_gettext () {
|
||||||
|
printf "%s" "# GETTEXT POISON #"
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue