From 6afc94d1e333023c869050041312357e6e7f5bb2 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Fri, 9 Feb 2007 19:19:52 +0000 Subject: [PATCH] - Start using the specified locale --- firefox.sh.in | 7 ++++++- firefox.spec | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/firefox.sh.in b/firefox.sh.in index aaef7aa..1af0b7e 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -128,8 +128,13 @@ fi # check system locale 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"` +[ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE" + MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"` -[ -f $MOZILLA_FIVE_HOME/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE" +[ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE" # if there's no command line argument and there's not a running diff --git a/firefox.spec b/firefox.spec index 191c98e..acdcfd3 100644 --- a/firefox.spec +++ b/firefox.spec @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 2.0.0.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet