rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed MOZ_LOCAL_LANGPACKS from browser launcher script (#284011)

Browse Source
This commit is contained in:
Martin Stransky 2010-01-05 13:37:25 +00:00
parent 6bc169c4f6
commit ea2cabb8bc
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
firefox.sh.in
View File

@ -154,25 +154,14 @@ export GNOME_DISABLE_CRASH_DIALOG
# #
## ##
## Fedora enables you to install custom language packs at firefox extension ## Automatically installed langpacks are tracked by .fedora-langpack-install
## directory (specified by MOZ_EXTENSIONS_PROFILE_DIR). To enable Firefox ## config file.
## custom localization, set MOZ_LOCAL_LANGPACKS=1 in your environment
## before launching Firefox.
## ##
# FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install"
# MOZ_LOCAL_LANGPACKS=1
# export MOZ_LOCAL_LANGPACKS
#
# check system locale # check system locale
MOZARGS= MOZARGS=
# Clear existing locale settings unless MOZ_LOCAL_LANGPACKS is set
mkdir -p $MOZ_EXTENSIONS_PROFILE_DIR
if ! [ $MOZ_LOCAL_LANGPACKS ] || [ $MOZ_LOCAL_LANGPACKS -eq 0 ]; then
find $MOZ_EXTENSIONS_PROFILE_DIR -maxdepth 1 -name "langpack-*@firefox.mozilla.org" -delete;
fi
# MOZ_DISABLE_LANGPACKS disables language packs completelly # MOZ_DISABLE_LANGPACKS disables language packs completelly
MOZILLA_DOWN=0 MOZILLA_DOWN=0
if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
@ -187,37 +176,45 @@ fi
# and language packs are not disabled # and language packs are not disabled
if [ $MOZILLA_DOWN -ne 0 ]; then if [ $MOZILLA_DOWN -ne 0 ]; then
# Enable local language pack (located in user extension directory) # Clear already installed langpacks
if [ $MOZ_LOCAL_LANGPACKS ] && [ $MOZ_LOCAL_LANGPACKS -ne 0 ]; then mkdir -p $MOZ_EXTENSIONS_PROFILE_DIR
# Try without a local variant first, then with a local variant if [ -f $FEDORA_LANGPACK_CONFIG ]; then
# So that pt-BR doesn't try to use pt for example rm `cat $FEDORA_LANGPACK_CONFIG`
SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"` rm $FEDORA_LANGPACK_CONFIG
if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then fi
MOZARGS="-UILocale $SHORTMOZLOCALE"
else # Try without a local variant first, then with a local variant
MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"` # So that pt-BR doesn't try to use pt for example
if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ]; then SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"`
MOZARGS="-UILocale $MOZLOCALE" MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"`
fi
fi
# Enable globally installed language pack (located in firefox # Try to link global langpacks to an extension directory
# installation directory) if [ -f $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then
else if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org ]; then
# Try without a local variant first, then with a local variant rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org"
# So that pt-BR doesn't try to use pt for example fi
SHORTMOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*||g"` if ! [ -e $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org ]; then
if [ -f $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then
MOZARGS="-UILocale $SHORTMOZLOCALE"
ln -s $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org \ ln -s $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org \
$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org
else echo "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > $FEDORA_LANGPACK_CONFIG
MOZLOCALE=`echo $LC_MESSAGES | sed "s|_\([^.]*\).*|-\1|g"` fi
if [ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ]; then elif [ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ]; then
MOZARGS="-UILocale $MOZLOCALE" if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org ]; then
ln -s $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org \ rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org"
$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org fi
fi if ! [ -e $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org ]; then
ln -s $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org \
$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org
echo "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org" > $FEDORA_LANGPACK_CONFIG
fi
fi
# And set it up for mozilla
if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then
MOZARGS="-UILocale $SHORTMOZLOCALE"
else
if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ]; then
MOZARGS="-UILocale $MOZLOCALE"
fi fi
fi fi
fi fi

5
firefox.spec
View File

@ -20,7 +20,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 3.6.1 Version: 3.6.1
Release: 0.7.%{?prever}%{?dist} Release: 0.8.%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -346,6 +346,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Jan 5 2009 Martin Stransky <stransky@redhat.com> - 3.6.1-0.8.b4
- Removed MOZ_LOCAL_LANGPACKS from browser launcher script (#284011)
* Mon Dec 21 2009 Martin Stransky <stransky@redhat.com> - 3.6.1-0.7.b4 * Mon Dec 21 2009 Martin Stransky <stransky@redhat.com> - 3.6.1-0.7.b4
- Update to 3.6.1 Beta 5 - Update to 3.6.1 Beta 5