summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@fedoraproject.org>2010-02-24 13:55:11 +0000
committerMartin Stransky <stransky@fedoraproject.org>2010-02-24 13:55:11 +0000
commite1fa01ec3d603131f9f48a1e75beb0851d75b1ce (patch)
tree18235e61f81431ab679d1d2c53966cf81cc5b2b7
parentUpdate to 3.6 (diff)
downloadlibrewolf-fedora-ff-e1fa01ec3d603131f9f48a1e75beb0851d75b1ce.tar.gz
librewolf-fedora-ff-e1fa01ec3d603131f9f48a1e75beb0851d75b1ce.tar.bz2
librewolf-fedora-ff-e1fa01ec3d603131f9f48a1e75beb0851d75b1ce.zip
Added fix for #559960
-rw-r--r--firefox.sh.in9
-rw-r--r--firefox.spec11
2 files changed, 16 insertions, 4 deletions
diff --git a/firefox.sh.in b/firefox.sh.in
index 803f74d..9c160d8 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -182,11 +182,16 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
rm `cat $FEDORA_LANGPACK_CONFIG` > /dev/null 2>&1
rm $FEDORA_LANGPACK_CONFIG > /dev/null 2>&1
fi
+
+ # Get locale from system
+ CURRENT_LOCALE=$LC_ALL
+ CURRENT_LOCALE=${CURRENT_LOCALE:-$LC_MESSAGES}
+ CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG}
# 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 $LC_MESSAGES | sed "s|_\([^.]*\).*||g"`
- MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"`
+ SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
+ MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
# Try to link global langpacks to an extension directory
if [ -f $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then
diff --git a/firefox.spec b/firefox.spec
index b85758a..5c5dae8 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -5,8 +5,11 @@
%define mozappdir %{_libdir}/%{name}-%{internal_version}
%define tarballdir mozilla-1.9.2
+# xulrunner_version matches the firefox package.
+# xulrunner_version_max is first next incompatible xulrunner version
%define xulrunner_version 1.9.2.1-1
-%define xulrunner_version_max 1.9.3
+%define xulrunner_version_max 1.9.2.2
+
%define internal_version 3.6
%define official_branding 1
@@ -21,7 +24,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 3.6.1
-Release: 1%{?prever}%{?dist}
+Release: 2%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -348,6 +351,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Feb 24 2010 Martin Stransky <stransky@redhat.com> - 3.6.1-2
+- Added fix for #559960 - [all Lang]Translation is not
+ available with 3.6 release
+
* Wed Jan 18 2010 Martin Stransky <stransky@redhat.com> - 3.6.1-1
- Update to 3.6
bgstack15