[gimp/gimp-2-8] Bug 721449 - Remove language black magic in OS X build

[Sven Claussner <sclaussner src gnome org>]

commit 83c0e41b10c62ec03b8c207048a12b51d61edff9
Author: Sven Claussner <sclaussner src gnome org>
Date:   Sun May 4 14:10:51 2014 +0200

    Bug 721449 - Remove language black magic in OS X build
    
    The language on OS X is properly set in GIMP also without the black
    magic code. To improve maintainability we remove it and also improve
    comments.
    
    (cherry picked from commit 556e9ac83e6208c00ae69e5302efe440dc63d86b)

 build/osx/launcher-2.8-python.sh |  143 ++++---------------------------------
 1 files changed, 16 insertions(+), 127 deletions(-)
---
diff --git a/build/osx/launcher-2.8-python.sh b/build/osx/launcher-2.8-python.sh
index c5e1089..f3cee9a 100755
--- a/build/osx/launcher-2.8-python.sh
+++ b/build/osx/launcher-2.8-python.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Purpose:     set up the runtime environment and run GIMP
+
 echo "Setting up environment..."
 
 if test "x$GTK_DEBUG_LAUNCHER" != x; then
@@ -31,10 +33,10 @@ export GTK_DATA_PREFIX="$bundle_res"
 export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
 
-# Set up path variable
+# Set up PATH variable
 export PATH="$bundle_contents/MacOS:$bundle_bin:$PATH"
 
-# Generic configuration
+# Set up generic configuration
 export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
 export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
 export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
@@ -45,25 +47,30 @@ export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
 export PANGO_SYSCONFDIR="$bundle_etc"
 export PANGO_LIBDIR="$bundle_lib"
 
-# Specify fonconfig configuration file
+# Specify Fontconfig configuration file
 export FONTCONFIG_FILE="$bundle_etc/fonts/fonts.conf"
 
-# Include gegl path
+# Include GEGL path
 export GEGL_PATH="$bundle_lib/gegl-0.2"
 
-echo "Enabling internal python..."
+# Set up Python
+
+echo "Enabling internal Python..."
 
-# Set up python
 export PYTHONHOME="$bundle_res"
-# Add bundled python modules
+
+# Add bundled Python modules
 PYTHONPATH="$bundle_lib/python2.7:$PYTHONPATH"
 PYTHONPATH="$bundle_lib/python2.7/site-packages:$PYTHONPATH"
 PYTHONPATH="$bundle_lib/python2.7/site-packages/gtk-2.0:$PYTHONPATH"
 PYTHONPATH="$bundle_lib/pygtk/2.0:$PYTHONPATH"
+
 # Include gimp python modules
 PYTHONPATH="$bundle_lib/gimp/2.0/python:$PYTHONPATH"
 export PYTHONPATH
 
+# Activate D-Bus
+
 #echo "Activating dbus..."
 
 # Launch dbus if needed
@@ -81,131 +88,13 @@ export PYTHONPATH
 #export DBUS_SESSION_BUS_PID
 #export DBUS_SESSION_BUS_ADDRESS
 
-# Specify ghostscript directories
+# Specify Ghostscript directories
 # export GS_RESOURCE_DIR="$bundle_res/share/ghostscript/9.06/Resource"
 # export GS_ICC_PROFILES="$bundle_res/share/ghostscript/9.06/iccprofiles/"
 # export 
GS_LIB="$GS_RESOURCE_DIR/Init:$GS_RESOURCE_DIR:$GS_RESOURCE_DIR/Font:$bundle_res/share/ghostscript/fonts:$bundle_res/share/fonts/urw-fonts:$GS_ICC_PROFILES"
 # export 
GS_FONTPATH="$bundle_res/share/ghostscript/fonts:$bundle_res/share/fonts/urw-fonts:~/Library/Fonts:/Library/Fonts:/System/Library/Fonts"
 
-echo "Locale black magic..."
-
-APP=name
-I18NDIR="$bundle_data/locale"
-# Set the locale-related variables appropriately:
-unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE
-
-# Has a language ordering been set?
-# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it.
-# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the 
chinese scripts from "Hans" to CN and "Hant" to TW.
-APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En -e 's/\-/_/' -e 's/Hant/TW/' -e 
's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' `
-if test "$APPLELANGUAGES"; then
-    # A language ordering exists.
-    # Test, item per item, to see whether there is an corresponding locale.
-    for L in $APPLELANGUAGES; do
-# Test for exact matches:
-       if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then
-export LANG=$L
-            break
-fi
-# This is a special case, because often the original strings are in US
-# English and there is no translation file.
-if test "x$L" == "xen_US"; then
-export LANG=$L
-break
-fi
-# OK, now test for just the first two letters:
-        if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then
-export LANG=${L:0:2}
-break
-fi
-# Same thing, but checking for any english variant.
-if test "x${L:0:2}" == "xen"; then
-export LANG=$L
-break
-fi;
-    done
-fi
-unset APPLELANGUAGES L
-
-# If we didn't get a language from the language list, try the Collation
-# preference, in case it's the only setting that exists.
-APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
-if test -z ${LANG} -a -n $APPLECOLLATION; then
-if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then
-export LANG=${APPLECOLLATION:0:2}
-    fi
-fi
-if test ! -z $APPLECOLLATION; then
-export LC_COLLATE=$APPLECOLLATION
-fi
-unset APPLECOLLATION
-
-# Continue by attempting to find the Locale preference.
-APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`
-
-if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then
-if test -z $LANG; then
-export LANG="${APPLELOCALE:0:5}"
-    fi
-
-elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then
-export LANG="${APPLELOCALE:0:2}"
-fi
-
-# Next we need to set LC_MESSAGES. If at all possilbe, we want a full
-# 5-character locale to avoid the "Locale not supported by C library"
-# warning from Gtk -- even though Gtk will translate with a
-# two-character code.
-if test -n $LANG; then
-# If the language code matches the applelocale, then that's the message
-# locale; otherwise, if it's longer than two characters, then it's
-# probably a good message locale and we'll go with it.
-    if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then
-export LC_MESSAGES=$LANG
-# Next try if the Applelocale is longer than 2 chars and the language
-# bit matches $LANG
-    elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then
-export LC_MESSAGES=${APPLELOCALE:0:5}
-# Fail. Get a list of the locales in $PREFIX/share/locale that match
-# our two letter language code and pick the first one, special casing
-# english to set en_US
-    elif test $LANG == "en"; then
-export LC_MESSAGES="en_US"
-    else
-LOC=`find $PREFIX/share/locale -name $LANG???`
-for L in $LOC; do
-export LC_MESSAGES=$L
-done
-fi
-else
-# All efforts have failed, so default to US english
-    export LANG="en_US"
-    export LC_MESSAGES="en_US"
-fi
-CURRENCY=`echo $APPLELOCALE | sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'`
-if test "x$CURRENCY" != "x"; then
-# The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in 
/usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to.
-    if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then
-if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then
-export LC_MONETARY=$LC_MESSAGES
-fi
-fi
-if test -z "$LC_MONETARY"; then
-FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;`
-if test -n "$FILES"; then
-export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'`
-fi
-fi
-fi
-# No currency value means that the AppleLocale governs:
-if test -z "$LC_MONETARY"; then
-LC_MONETARY=${APPLELOCALE:0:5}
-fi
-# For gtk, which only looks at LC_ALL:
-export LC_ALL=$LC_MESSAGES
-
-unset APPLELOCALE FILES LOC
-
+# set up character encoding aliases
 if test -f "$bundle_lib/charset.alias"; then
 export CHARSETALIASDIR="$bundle_lib"
 fi