diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-20 00:06:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 00:06:41 (GMT) |
| commit | 2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40 (patch) | |
| tree | 3753154d3da34ff50e82a667a75ad56437d4d12f /t/test-lib.sh | |
| parent | 85878dd0c929dde5d91411b57ef9f2d696cbc7d8 (diff) | |
| parent | 5e9637c629702e3d41ad01d95956d1835d7338e0 (diff) | |
| download | git-2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40.zip git-2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40.tar.gz git-2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40.tar.bz2 | |
Merge branch 'ab/enable-i18n'
* ab/enable-i18n:
i18n: add infrastructure for translating Git with gettext
Conflicts:
Makefile
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 160479b..0e932dd 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -44,6 +44,7 @@ export LANG LC_ALL PAGER TERM TZ EDITOR=: unset VISUAL unset EMAIL +unset LANGUAGE unset $(perl -e ' my @env = keys %ENV; my $ok = join("|", qw( @@ -1118,12 +1119,14 @@ esac test -z "$NO_PERL" && test_set_prereq PERL test -z "$NO_PYTHON" && test_set_prereq PYTHON test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE +test -z "$NO_GETTEXT" && test_set_prereq GETTEXT # Can we rely on git's output in the C locale? if test -n "$GETTEXT_POISON" then GIT_GETTEXT_POISON=YesPlease export GIT_GETTEXT_POISON + test_set_prereq GETTEXT_POISON else test_set_prereq C_LOCALE_OUTPUT fi |