Author: hawk Date: Thu Jun 26 07:25:57 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- don't force UI locale, let user choose language he wants
---- Files affected:
SOURCES:
iceweasel.sh (1.2 -> 1.3) , icedove.sh (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/iceweasel.sh
diff -u SOURCES/iceweasel.sh:1.2 SOURCES/iceweasel.sh:1.3
--- SOURCES/iceweasel.sh:1.2 Mon Jun 23 12:15:44 2008
+++ SOURCES/iceweasel.sh Thu Jun 26 09:25:51 2008
@@ -3,33 +3,6 @@
LIBDIR="@LIBDIR@/iceweasel"
-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
@@ -39,11 +12,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 "$@"
================================================================
Index: SOURCES/icedove.sh
diff -u SOURCES/icedove.sh:1.1 SOURCES/icedove.sh:1.2
--- SOURCES/icedove.sh:1.1 Tue Jun 24 12:15:02 2008
+++ SOURCES/icedove.sh Thu Jun 26 09:25:51 2008
@@ -3,38 +3,7 @@
LIBDIR="@LIBDIR@/icedove"
-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 ${MOZILLA_FIVE_HOME}/chrome/${MOZLANG}*.jar \
- | sed 's/\s.*//g' )
- if [ -f "$LANGFILE" ]; then
- MOZLANG=$(basename "$LANGFILE" | sed 's/\.jar//')
- MOZARGS="-UILocale $MOZLANG"
- break
- fi
- done
-fi
-
-if [ -n "$MOZARGS" ]; then
- ICEDOVE="$LIBDIR/icedove $MOZARGS"
-else
- ICEDOVE="$LIBDIR/icedove"
-fi
+ICEDOVE="$LIBDIR/icedove"
if [ "$1" == "-remote" ]; then
$ICEDOVE "$@"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iceweasel.sh?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/icedove.sh?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
