X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=po%2Fxgetpo;h=a28291bedb096b3df556433f8e16c88a299ca3b7;hb=e07525be59129c129bbf0b7ade1c08ae36f9d485;hp=cc54e2b0845d392f7e2fb6c1eda9554e33afd292;hpb=e7a2b2b3ba4955dca9efad630498ae10c73fbc83;p=squirrelmail.git

diff --git a/po/xgetpo b/po/xgetpo
index cc54e2b0..a28291be 100755
--- a/po/xgetpo
+++ b/po/xgetpo
@@ -7,7 +7,24 @@
 # ** 
 # **  $Id$
 #
-XGETTEXT_OPTIONS="--keyword=_ -keyword=N_ --keyword=ngettext:1,2 --default-domain=squirrelmail --no-location -C"
+
+# force use of same locale in order to keep same sorting order
+LC_ALL=en_US.ISO8859-1
+LANG=en_US.ISO8859-1
+export LC_ALL LANG
+
+# set common gettext options
+XGETTEXT_OPTIONS="--keyword=_ -keyword=N_ --keyword=ngettext:1,2 --default-domain=squirrelmail --no-location --add-comments"
+
+# Allows controlling language option
+# (gettext v.0.10.40 = -C, gettext 0.11+ = -L php).
+if [ $SM_LANG_PHP ] ; then
+ XGETTEXT_OPTIONS="${XGETTEXT_OPTIONS} -L php";
+else
+ XGETTEXT_OPTIONS="${XGETTEXT_OPTIONS} -C";
+fi
+  
+
 cd ..
 xgettext ${XGETTEXT_OPTIONS} \
     src/*.php --output=po/squirrelmail.pot
@@ -70,6 +87,12 @@ xgettext ${XGETTEXT_OPTIONS} -j \
 xgettext ${XGETTEXT_OPTIONS} -j \
     plugins/translate/*.php --output=po/squirrelmail.pot
 
+# ** templates
+xgettext ${XGETTEXT_OPTIONS} -j \
+    templates/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    templates/default/*.tpl --output=po/squirrelmail.pot
+
 xgettext ${XGETTEXT_OPTIONS} -j \
     po/independent_strings.txt --output=po/squirrelmail.pot