[geany/geany-osx] 0deaa4: Respect locale by default - Commits

28 Dec 2017


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Thu, 28 Dec 2017 14:06:45 UTC
Commit:      0deaa4112332da4b5a66f4647adc116ca5b85ee7
             https://github.com/geany/geany-osx/commit/0deaa4112332da4b5a66f4647adc116ca5...
Log Message:
-----------
Respect locale by default
Users more probably want to use their locale for translation so make this default.
It's still possible to override this behavior by creating the
~/.config/geany/ignore_locale file.
Modified Paths:
--------------
    launcher-gtk2.sh
    launcher-gtk3.sh
Modified: launcher-gtk2.sh
13 lines changed, 6 insertions(+), 7 deletions(-)
===================================================================
@@ -55,7 +55,11 @@ export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 export PANGO_LIBDIR="$bundle_lib"
 export PANGO_SYSCONFDIR="$bundle_etc"
-if test -e ~/.config/geany/use_locale; then 
+if test -e ~/.config/geany/ignore_locale; then
+    export LANG="en_US"
+    export LC_MESSAGES="en_US"
+    export LC_ALL="en_US.UTF-8"
+else
APP=$name
 I18NDIR="$bundle_data/locale"
@@ -173,12 +177,7 @@ export LC_ALL=$LC_MESSAGES
unset APPLELOCALE FILES LOC
-#~/.config/geany/use_locale doesn't exist
-else
-  export LANG="en_US"
-  export LC_MESSAGES="en_US"
-  export LC_ALL="en_US.UTF-8"
-fi
+fi #ignore_locale
if test -f "$bundle_lib/charset.alias"; then
     export CHARSETALIASDIR="$bundle_lib"
Modified: launcher-gtk3.sh
13 lines changed, 6 insertions(+), 7 deletions(-)
===================================================================
@@ -55,7 +55,11 @@ if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
     export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules"
 fi
-if test -e ~/.config/geany/use_locale; then 
+if test -e ~/.config/geany/ignore_locale; then
+    export LANG="en_US"
+    export LC_MESSAGES="en_US"
+    export LC_ALL="en_US.UTF-8"
+else
APP=$name
 I18NDIR="$bundle_data/locale"
@@ -173,12 +177,7 @@ export LC_ALL=$LC_MESSAGES
unset APPLELOCALE FILES LOC
-#~/.config/geany/use_locale doesn't exist
-else
-  export LANG="en_US"
-  export LC_MESSAGES="en_US"
-  export LC_ALL="en_US.UTF-8"
-fi
+fi #ignore_locale
if test -f "$bundle_lib/charset.alias"; then
     export CHARSETALIASDIR="$bundle_lib"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    