Author: sparky Date: Sun Oct 2 12:36:37 2005 GMT
Module: . Tag: HEAD
---- Log message:
- try harder finding locale
---- Files affected:
./SOURCES:
mozilla-firefox.sh (1.6 -> 1.7)
---- Diffs:
================================================================
Index: ./SOURCES/mozilla-firefox.sh
diff -u ./SOURCES/mozilla-firefox.sh:1.6 ./SOURCES/mozilla-firefox.sh:1.7
--- ./SOURCES/mozilla-firefox.sh:1.6 Thu Mar 3 16:01:46 2005
+++ ./SOURCES/mozilla-firefox.sh Sun Oct 2 14:36:32 2005
@@ -9,10 +9,31 @@
MOZILLA_FIVE_HOME=$LIBDIR
-MOZLOCALE="$(/usr/bin/locale | grep "^LC_MESSAGES=" | sed -e
"s|LC_MESSAGES=||g" -e "s|\"||g" )"
-eval MOZLOCALE="$(echo $MOZLOCALE | sed -e "s|_\([^.]*\).*|-\1|g")"
+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")"
-[ -f $MOZILLA_FIVE_HOME/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale
$MOZLOCALE"
+ if [ -f $MOZILLA_FIVE_HOME/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
FIREFOX="$LIBDIR/firefox $MOZARGS"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/./SOURCES/mozilla-firefox.sh?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
