From a31088e9f34b5df2df067bee7e6e2579436915a0 Mon Sep 17 00:00:00 2001
From: Jan Horak <xhorak@fedoraproject.org>
Date: Wed, 7 Jan 2009 15:49:05 +0000
Subject: Fixed wrong LANG and LC_MESSAGES variables interpretation
 (#441973)\nin     startup script.

---
 firefox.sh.in | 4 ++--
 firefox.spec  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/firefox.sh.in b/firefox.sh.in
index e8f5048..6994e0b 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -140,10 +140,10 @@ export GNOME_DISABLE_CRASH_DIALOG
 MOZARGS=
 # Try without a local variant first, then with a local variant
 # So that pt-BR doesn't try to use pt for example
-SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"`
 [ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE"
 
-MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
+MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"`
 [ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"
 
 # Prepare command line arguments
diff --git a/firefox.spec b/firefox.spec
index 3ac8a48..46cc7fc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -19,7 +19,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.1
-Release:        0.4.beta2%{?dist}
+Release:        0.5.beta2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -326,6 +326,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan  7 2009 Jan Horak <jhorak@redhat.com> - 3.1-0.5
+- Fixed wrong LANG and LC_MESSAGES variables interpretation (#441973) 
+  in startup script.
+
 * Sat Dec 20 2008 Christopher Aillon <caillon@redhat.com> 3.1-0.4
 - 3.1 beta 2
 
-- 
cgit