diff options
| author | Martin Stransky <stransky@fedoraproject.org> | 2010-02-24 13:55:11 +0000 |
|---|---|---|
| committer | Martin Stransky <stransky@fedoraproject.org> | 2010-02-24 13:55:11 +0000 |
| commit | e1fa01ec3d603131f9f48a1e75beb0851d75b1ce (patch) | |
| tree | 18235e61f81431ab679d1d2c53966cf81cc5b2b7 /firefox.sh.in | |
| parent | Update to 3.6 (diff) | |
| download | librewolf-fedora-ff-e1fa01ec3d603131f9f48a1e75beb0851d75b1ce.tar.gz librewolf-fedora-ff-e1fa01ec3d603131f9f48a1e75beb0851d75b1ce.tar.bz2 librewolf-fedora-ff-e1fa01ec3d603131f9f48a1e75beb0851d75b1ce.zip | |
Added fix for #559960
Diffstat (limited to 'firefox.sh.in')
| -rw-r--r-- | firefox.sh.in | 9 |
1 files changed, 7 insertions, 2 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 |