SOURCES: iceweasel.sh - revert revert, uhh. There is a special setting for ...
arekm
arekm at pld-linux.org
Mon Aug 18 18:42:24 CEST 2008
Author: arekm Date: Mon Aug 18 16:42:24 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- revert revert, uhh. There is a special setting for locale in mozilla apps, no need to hack init script.
---- Files affected:
SOURCES:
iceweasel.sh (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/iceweasel.sh
diff -u SOURCES/iceweasel.sh:1.5 SOURCES/iceweasel.sh:1.6
--- SOURCES/iceweasel.sh:1.5 Mon Aug 18 17:21:38 2008
+++ SOURCES/iceweasel.sh Mon Aug 18 18:42:18 2008
@@ -12,33 +12,6 @@
fi
fi
-MOZARGS=
-MOZLOCALE="$(/usr/bin/locale | grep "^LC_MESSAGES=" | \
- sed -e "s|LC_MESSAGES=||g" -e "s|\"||g" )"
-for MOZLANG in $(echo $LANGUAGE | tr ":" " ") $MOZLOCALE; do
- eval MOZLANG="$(echo $MOZLANG | sed -e "s|_\([^.]*\).*|-\1|g")"
-
- if [ -f $LIBDIR/chrome/$MOZLANG.jar ]; then
- MOZARGS="-UILocale $MOZLANG"
- break
- fi
-done
-
-if [ -z "$MOZARGS" ]; then
- # try harder
- for MOZLANG in $(echo $LANGUAGE | tr ":" " ") $MOZLOCALE; do
- eval MOZLANG="$(echo $MOZLANG | sed -e "s|_.*||g")"
-
- LANGFILE=$(echo $LIBDIR/chrome/${MOZLANG}*.jar \
- | sed 's/\s.*//g' )
- if [ -f "$LANGFILE" ]; then
- MOZLANG=$(basename "$LANGFILE" | sed 's/\.jar//')
- MOZARGS="-UILocale $MOZLANG"
- break
- fi
- done
-fi
-
# compreg.dat and/or chrome.rdf will screw things up if it's from an
# older version. http://bugs.gentoo.org/show_bug.cgi?id=63999
for f in ~/{.,.mozilla/}iceweasel/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do
@@ -48,11 +21,7 @@
fi
done
-if [ -n "$MOZARGS" ]; then
- ICEWEASEL="$LIBDIR/iceweasel $MOZARGS"
-else
- ICEWEASEL="$LIBDIR/iceweasel"
-fi
+ICEWEASEL="$LIBDIR/iceweasel"
if [ "$1" == "-remote" ]; then
exec $ICEWEASEL "$@"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iceweasel.sh?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list