SOURCES: iceweasel.sh, icedove.sh - restored UI locale forcing, users are s...

[hawk]

Author: hawk                         Date: Mon Aug 18 15:21:44 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- restored UI locale forcing, users are stupid and shouldn't be able to do
  what they want, let system think for them

---- Files affected:
SOURCES:
   iceweasel.sh (1.4 -> 1.5) , icedove.sh (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/iceweasel.sh
diff -u SOURCES/iceweasel.sh:1.4 SOURCES/iceweasel.sh:1.5
--- SOURCES/iceweasel.sh:1.4	Thu Jun 26 21:13:59 2008
+++ SOURCES/iceweasel.sh	Mon Aug 18 17:21:38 2008
@@ -12,6 +12,33 @@
 	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
@@ -21,7 +48,11 @@
 	fi
 done
 
-ICEWEASEL="$LIBDIR/iceweasel"
+if [ -n "$MOZARGS" ]; then
+	ICEWEASEL="$LIBDIR/iceweasel $MOZARGS"
+else
+	ICEWEASEL="$LIBDIR/iceweasel"
+fi
 
 if [ "$1" == "-remote" ]; then
 	exec $ICEWEASEL "$@"

================================================================
Index: SOURCES/icedove.sh
diff -u SOURCES/icedove.sh:1.3 SOURCES/icedove.sh:1.4
--- SOURCES/icedove.sh:1.3	Thu Jun 26 21:13:28 2008
+++ SOURCES/icedove.sh	Mon Aug 18 17:21:38 2008
@@ -12,7 +12,38 @@
 	fi
 fi
 
-ICEDOVE="$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
 
 if [ "$1" == "-remote" ]; then
 	$ICEDOVE "$@"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iceweasel.sh?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/icedove.sh?r1=1.3&r2=1.4&f=u