Merge branch 'js/visual-studio'

diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh
index 755f4214319fb931870b701d4177a32f38849565..2139b427ca1ced9ba0342ef33d634c9b054ade5e 100644 (file)
--- a/t/lib-gettext.sh
+++ b/t/lib-gettext.sh
@@ -10,7 +10,12 @@ GIT_TEXTDOMAINDIR="$GIT_BUILD_DIR/po/build/locale"
 GIT_PO_PATH="$GIT_BUILD_DIR/po"
 export GIT_TEXTDOMAINDIR GIT_PO_PATH
 
-. "$GIT_BUILD_DIR"/git-sh-i18n
+if test -n "$GIT_TEST_INSTALLED"
+then
+       . "$(git --exec-path)"/git-sh-i18n
+else
+       . "$GIT_BUILD_DIR"/git-sh-i18n
+fi
 
 if test_have_prereq GETTEXT && test_have_prereq C_LOCALE_OUTPUT
 then