X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=po%2Fxgetpo;h=b71cf299afb405ae3f7dce26a992fe5548c91d94;hb=f008af8670df6a3c979a66df76b3c1e1e5a0c9cd;hp=5a4530cb3a5dc388d2fc3a858d0931f19475c42d;hpb=de0ed34be9ee14827f82f4132167e60f4782ea73;p=squirrelmail.git

diff --git a/po/xgetpo b/po/xgetpo
index 5a4530cb..b71cf299 100755
--- a/po/xgetpo
+++ b/po/xgetpo
@@ -1,68 +1,104 @@
 #!/bin/sh
 
 # **
-# ** This script regenerates main PO file
+# ** This script regenerates main POT file
 # **
 # ** Philipe Mingo <mingo@rotedic.com>
 # ** 
-# **  $Id$ 
-cd ../..
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail \
-    --no-location -C squirrelmail/src/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/functions/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/class/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/class/mime/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/class/deliver/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/class/helper/*.php --output=squirrelmail/po/squirrelmail.pot    
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/include/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/include/options/*.php --output=squirrelmail/po/squirrelmail.pot
+# **  $Id$
+#
+
+# 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
+xgettext ${XGETTEXT_OPTIONS} -j \
+    functions/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    class/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    class/mime/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    class/deliver/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    class/helper/*.php --output=po/squirrelmail.pot    
+xgettext ${XGETTEXT_OPTIONS} -j \
+    class/l10n/*.php --output=po/squirrelmail.pot    
+xgettext ${XGETTEXT_OPTIONS} -j \
+    include/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    include/options/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    images/themes/*/*.php --output=po/squirrelmail.pot
     
 # ** Plugins
     
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/abook_take/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/administrator/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/bug_report/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/calendar/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/delete_move_next/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/filters/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/fortune/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/info/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/listcommands/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/mail_fetch/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/message_details/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/newmail/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/sent_subfolders/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-   --no-location  -C squirrelmail/plugins/spamcop/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/squirrelspell/*.php --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/squirrelspell/modules/*.mod \
-    --output=squirrelmail/po/squirrelmail.pot
-xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/plugins/translate/*.php --output=squirrelmail/po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/abook_take/*.php --output=po/squirrelmail.pot
+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/calendar/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/change_password/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/change_password/backend/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/filters/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/fortune/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/info/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/listcommands/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/mail_fetch/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/message_details/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/newmail/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/sent_subfolders/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/spamcop/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/squirrelspell/*.php --output=po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    plugins/squirrelspell/modules/*.mod \
+    --output=po/squirrelmail.pot
+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 --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
-    --no-location -C squirrelmail/po/independent_strings.txt --output=squirrelmail/po/squirrelmail.pot
+xgettext ${XGETTEXT_OPTIONS} -j \
+    po/independent_strings.txt --output=po/squirrelmail.pot
 
-cd squirrelmail/po
+cd po