From ea5307de1a0f2fdea3ea7d793559408f665a2bfe Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 4 Jan 2019 13:49:06 +0100 Subject: Changed locale detector to handle Esperanto (rhbz#1656900) --- firefox.sh.in | 4 ++-- firefox.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/firefox.sh.in b/firefox.sh.in index adf98e9..4ad7237 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -191,8 +191,8 @@ if [ $MOZILLA_DOWN -ne 0 ]; then CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG} # Try with a local variant first, then without a local variant - SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"` - MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"` + SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"` + MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g" | sed "s|\..*||g"` function create_langpack_link() { local language=$* diff --git a/firefox.spec b/firefox.spec index c55c98e..957f2ae 100644 --- a/firefox.spec +++ b/firefox.spec @@ -74,7 +74,7 @@ ExcludeArch: armv7hl Summary: Mozilla Firefox Web browser Name: firefox Version: 64.0 -Release: 5%{?pre_tag}%{?dist} +Release: 6%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -898,6 +898,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Jan 4 2019 Carmen Bianca Bakker - 64.0-6 +- Changed locale detector to handle Esperanto (rhbz#1656900) + * Fri Dec 21 2018 Martin Stransky - 64.0-5 - Test PGO build. -- cgit