X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=po%2Fxgetpo;h=1c1a385ebe75978f90a32f6a75773c80d67150c6;hp=cc54e2b0845d392f7e2fb6c1eda9554e33afd292;hb=0bbf8622773554348ff9dc200e7e01411a81be0b;hpb=e7a2b2b3ba4955dca9efad630498ae10c73fbc83

diff --git a/po/xgetpo b/po/xgetpo
index cc54e2b0..1c1a385e 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=i18n"
+
+# 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
@@ -38,6 +55,8 @@ xgettext ${XGETTEXT_OPTIONS} -j \
     plugins/administrator/*.php --output=po/squirrelmail.pot
 xgettext ${XGETTEXT_OPTIONS} -j \
     plugins/bug_report/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/bug_report/templates/default/*.tpl --output=po/squirrelmail.pot
 xgettext ${XGETTEXT_OPTIONS} -j \
     plugins/calendar/*.php --output=po/squirrelmail.pot
 xgettext ${XGETTEXT_OPTIONS} -j \
@@ -70,6 +89,17 @@ 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 \
+    templates/default_advanced/*.tpl --output=po/squirrelmail.pot
+    
+# Independent strings
+
 xgettext ${XGETTEXT_OPTIONS} -j \
     po/independent_strings.txt --output=po/squirrelmail.pot