Changeset 782 for git/branches/dmik/git-sh-i18n.sh

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• git-sh-i18n.sh (modified) (3 diffs)

git/branches/dmik/git-sh-i18n.sh ¶

@@ -1 @@
-#!/bin/sh
+# This shell library is Git's interface to gettext.sh. See po/README
+# for usage instructions.
 #
 # Copyright (c) 2010 Ævar Arnfjörð Bjarmason
 #
-# This is Git's interface to gettext.sh. See po/README for usage
-# instructions.
 
 # Export the TEXTDOMAIN* data that we need for Git
@@ -17 +16 @@
 export TEXTDOMAINDIR
 
-if test -z "$GIT_GETTEXT_POISON"
+# First decide what scheme to use...
+GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
+if test -n "@@USE_GETTEXT_SCHEME@@"
 then
-        if test -z "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" && type gettext.sh >/dev/null 2>&1
-        then
-                # This is GNU libintl's gettext.sh, we don't need to do anything
-                # else than setting up the environment and loading gettext.sh
-                GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
-                export GIT_INTERNAL_GETTEXT_SH_SCHEME
+        GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
+elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+then
+        : no probing necessary
+elif test -n "$GIT_GETTEXT_POISON"
+then
+        GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
+elif type gettext.sh >/dev/null 2>&1
+then
+        # GNU libintl's gettext.sh
+        GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
+elif test "$(gettext -h 2>&1)" = "-h"
+then
+        # gettext binary exists but no gettext.sh. likely to be a gettext
+        # binary on a Solaris or something that is not GNU libintl and
+        # lack eval_gettext.
+        GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext
+fi
+export GIT_INTERNAL_GETTEXT_SH_SCHEME
 
-                # Try to use libintl's gettext.sh, or fall back to English if we
-                # can't.
-                . gettext.sh
-
-        elif test -z "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" && test "$(gettext -h 2>&1)" = "-h"
-        then
-                # We don't have gettext.sh, but there's a gettext binary in our
-                # path. This is probably Solaris or something like it which has a
-                # gettext implementation that isn't GNU libintl.
-                GIT_INTERNAL_GETTEXT_SH_SCHEME=solaris
-                export GIT_INTERNAL_GETTEXT_SH_SCHEME
-
-                # Solaris has a gettext(1) but no eval_gettext(1)
-                eval_gettext () {
-                        gettext "$1" | (
-                                export PATH $(git sh-i18n--envsubst --variables "$1");
-                                git sh-i18n--envsubst "$1"
-                        )
-                }
-
-        else
-                # Since gettext.sh isn't available we'll have to define our own
-                # dummy pass-through functions.
-
-                # Tell our tests that we don't have the real gettext.sh
-                GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-                export GIT_INTERNAL_GETTEXT_SH_SCHEME
-
-                gettext () {
-                        printf "%s" "$1"
-                }
-
-                eval_gettext () {
-                        printf "%s" "$1" | (
-                                export PATH $(git sh-i18n--envsubst --variables "$1");
-                                git sh-i18n--envsubst "$1"
-                        )
-                }
-        fi
-else
-        # Emit garbage under GETTEXT_POISON=YesPlease. Unlike the C tests
-        # this relies on an environment variable
-
-        GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-        export GIT_INTERNAL_GETTEXT_SH_SCHEME
-
+# ... and then follow that decision.
+case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
+gnu)
+        # Use libintl's gettext.sh, or fall back to English if we can't.
+        . gettext.sh
+        ;;
+gettext_without_eval_gettext)
+        # Solaris has a gettext(1) but no eval_gettext(1)
+        eval_gettext () {
+                gettext "$1" | (
+                        export PATH $(git sh-i18n--envsubst --variables "$1");
+                        git sh-i18n--envsubst "$1"
+                )
+        }
+        ;;
+poison)
+        # Emit garbage so that tests that incorrectly rely on translatable
+        # strings will fail.
         gettext () {
                 printf "%s" "# GETTEXT POISON #"
@@ -79 +65 @@
                 printf "%s" "# GETTEXT POISON #"
         }
-fi
+        ;;
+*)
+        gettext () {
+                printf "%s" "$1"
+        }
+
+        eval_gettext () {
+                printf "%s" "$1" | (
+                        export PATH $(git sh-i18n--envsubst --variables "$1");
+                        git sh-i18n--envsubst "$1"
+                )
+        }
+        ;;
+esac
 
 # Git-specific wrapper functions