SOURCES: icedove.sh - revert revert, uhh. There is a special setting for lo...

arekm arekm at pld-linux.org
Mon Aug 18 18:29:59 CEST 2008


Author: arekm                        Date: Mon Aug 18 16:29:59 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:
   icedove.sh (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/icedove.sh
diff -u SOURCES/icedove.sh:1.4 SOURCES/icedove.sh:1.5
--- SOURCES/icedove.sh:1.4	Mon Aug 18 17:21:38 2008
+++ SOURCES/icedove.sh	Mon Aug 18 18:29:53 2008
@@ -12,38 +12,7 @@
 	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 ${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/icedove.sh?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list