rpms/firefox/devel firefox.sh.in, 1.16, 1.17 firefox.spec, 1.168, 1.169

[fedora-cvs-commits at redhat.com]

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5132

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
* Fri Feb  9 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-5
- Start using the specified locale



Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- firefox.sh.in	18 Jan 2007 20:19:14 -0000	1.16
+++ firefox.sh.in	9 Feb 2007 19:17:54 -0000	1.17
@@ -128,8 +128,13 @@
 
 # check system locale
 MOZARGS=
+# Try without a local variant first, then with a local variant
+# So that pt-BR doesn't try to use pt for example
+SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"`
+[ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE"
+
 MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
-[ -f $MOZILLA_FIVE_HOME/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"
+[ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"
 
 
 # if there's no command line argument and there's not a running


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- firefox.spec	31 Jan 2007 04:40:11 -0000	1.168
+++ firefox.spec	9 Feb 2007 19:17:55 -0000	1.169
@@ -410,6 +410,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Feb  9 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-5
+- Start using the specified locale
+
 * Tue Jan 30 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.1-4
 - Fix the DND implementation to not grab, so it works with new GTK+.