--- builds_bin/update_templates	2008/07/08 13:58:19	1.1
+++ builds_bin/update_templates	2009/03/05 20:25:08	1.6
@@ -67,6 +67,10 @@ do
     diffcp /etc/pootle/templates/$(basename $pkg).pot /etc/pootle/po/sme7bp/templates/$(basename $pkg).pot
 done
 
+# Update sme7admin template
+potempl /etc/pootle/cvs/smecontribs/smeserver-sme7admin/*/*/root/{etc/e-smith/web/functions/sme7admin,usr/bin/sme7admind} > sme7admin.pot
+diffmv sme7admin.pot /etc/pootle/po/sme7cp/templates/sme7admin.pot
+
 # Update contrib panel templates
 for pkg in $(find /etc/pootle/cvs/smecontribs/*/*7/*/root/etc/e-smith/locale/en-us/ -type f -print)
 do
@@ -81,7 +85,8 @@ for lang in $(ls -I templates /etc/pootl
 do
     # Create error compendium to assist translators
     pocompendium -e errors-$lang.po -d /etc/pootle/po/sme*/$lang
-    sed -i '0,/^$/d' errors-$lang.po
+    sed -i '0,/^$/d;/^#~/d' errors-$lang.po
+    sed -i ':a;/^\n*$/{$d;N;ba;}' errors-$lang.po
     chmod 644 errors-$lang.po
     diffmv errors-$lang.po /var/www/html/errors/errors-$lang.po
 
@@ -119,7 +124,7 @@ done
 # Recalculate stats and restart server
 cd /etc/pootle
 PootleServer --refreshstats &> /dev/null
-nohup PootleServer --servertype threaded >> /var/log/pootle.log 2>&1 &
+nohup PootleServer --prefsfile /etc/pootle/pootle.prefs >> /var/log/pootle.log 2>&1 &
 
 #==========================================================
 
@@ -140,17 +145,25 @@ do
     # Build console files
     pkgname=$(ls -d /etc/pootle/cvs/smeserver/smeserver-locale/*7/*/root | cut -d/ -f8)
     mkdir -p ${pkgname}.update/po/$lang
-    for pkg in $(ls /etc/pootle/po/sme7bc/templates/ -I anaconda.pot | sed 's@\.pot@\.po@')
+    for pkg in $(ls /etc/pootle/po/sme7bc/templates/ -I anaconda.pot | sed -n 's@\.pot@\.po@p')
     do
 	msgcat -F --no-wrap /etc/pootle/po/sme7bc/$lang/$pkg \
 	| grep -v 'Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|X-Generator' \
 	| sed '0,/msgid ""/{/^#/d};/^#,/d' \
 	> ${pkgname}.update/po/$lang/$pkg
     done 
+
+    # Build sme7admin file
+    pkgname=$(ls -d /etc/pootle/cvs/smecontribs/smeserver-sme7admin/*7/*/root | cut -d/ -f8)
+    mkdir -p ${pkgname}.update/po/$lang
+    msgcat -F --no-wrap /etc/pootle/po/sme7cp/$lang/sme7admin.po \
+    | grep -v 'Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|X-Generator' \
+    | sed '0,/msgid ""/{/^#/d};/^#,/d' \
+    > ${pkgname}.update/po/$lang/sme7admin.po
 done
 
 # Build translated xml files
-for pkg in $(ls /etc/pootle/po/sme7*p/templates/ | sed -n 's@\.pot@@p')
+for pkg in $(ls /etc/pootle/po/sme7*p/templates/ -I sme7admin.pot | sed -n 's@\.pot@@p')
 do
     pkgname=$(find /etc/pootle/cvs/smecontribs/*/*7/*/root/etc/e-smith/locale/en-us -name $pkg | cut -d/ -f8)
     if [ -z "$pkgname" ]
@@ -179,7 +192,7 @@ done
 for pkg in $(ls -d *.update | sed 's@.update$@@')
 do
     orig=/etc/pootle/cvs/sme*/*/*7/$pkg/root/etc/e-smith/locale
-    rm /var/www/html/patches/$(echo $pkg | sed 's/-[^-]\+$//')-*-locale-*.patch
+    rm -f /var/www/html/patches/$(echo $pkg | sed 's/-[^-]\+$//')-*-locale-*.patch
     diff -ruN $orig $pkg.update/root/etc/e-smith/locale \
     | sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/root/.*\)@\1 \2@;/^diff -ruN/d' \
     > /var/www/html/patches/$pkg-locale-$(date +%F).patch
@@ -188,70 +201,14 @@ done
 # Build console diffs
 pkg=$(ls -d smeserver-locale-* | sed 's@.update$@@')
 orig=/etc/pootle/cvs/smeserver/smeserver-locale/*7/$pkg/po
-rm /var/www/html/patches/$(echo $pkg | sed 's/-[^-]\+$//')-*-locale-*.patch
 diff -ruN $orig $pkg.update/po \
 | sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/po/.*\)@\1 \2@;/^diff -ruN/d' \
 >> /var/www/html/patches/$pkg-locale-$(date +%F).patch
 
-## cd /etc/pootle/tmp
-## 
-## # Build diffs for languages
-## rm -f /var/www/html/patches/smeserver-locale-all-*.patch /var/www/html/patches/contribs/*
-## for lang in $(ls /etc/pootle/po/sme7bp -I templates)
-## do
-##     # Remove previous patches
-##     rm -f /var/www/html/patches/smeserver-locale-$lang-*.patch
-## 
-##     # Build anaconda files
-##     mkdir -p /var/www/html/anaconda/sme7/$lang/LC_MESSAGES
-##     anacondagen sme7 $lang > /var/www/html/anaconda/sme7/$lang/LC_MESSAGES/anaconda.mo
-##     [ -s /var/www/html/anaconda/sme7/$lang/LC_MESSAGES/anaconda.mo ] || rm -rf /var/www/html/anaconda/sme7/$lang
-## 
-##     mkdir -p /var/www/html/anaconda/sme8/$lang/LC_MESSAGES
-##     anacondagen sme8 $lang > /var/www/html/anaconda/sme8/$lang/LC_MESSAGES/anaconda.mo
-##     [ -s /var/www/html/anaconda/sme8/$lang/LC_MESSAGES/anaconda.mo ] || rm -rf /var/www/html/anaconda/sme8/$lang
-## 
-##     # Build console diffs
-##     mkdir -p pootleupdate/po/$lang
-##     for pkg in $(ls /etc/pootle/po/sme7bc/templates/ -I anaconda.pot | sed 's@\.pot@\.po@')
-##     do
-## 	msgcat -F --no-wrap /etc/pootle/po/sme7bc/$lang/$pkg \
-## 	| grep -v 'Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|X-Generator' \
-## 	| sed '0,/msgid ""/{/^#/d}' \
-## 	> pootleupdate/po/$lang/$pkg
-## 	if [ -f /etc/pootle/cvs/smeserver/smeserver-locale/*/*/po/$lang/$pkg ]
-## 	then
-## 	    diff -u /etc/pootle/cvs/smeserver/smeserver-locale/*/*/po/$lang/$pkg pootleupdate/po/$lang/$pkg \
-## 	    | sed 's@/etc/pootle/cvs/smeserver/smeserver-locale/@@' \
-## 	    >> /var/www/html/patches/smeserver-locale-$lang-$(date +%F).patch
-## 	else
-## 	    diff -u /dev/null pootleupdate/po/$lang/$pkg >> /var/www/html/patches/smeserver-locale-$lang-$(date +%F).patch
-## 	fi
-##     done 
-## 
-##     # Build panel diffs
-##     mkdir -p pootleupdate/{$(localedir $lang general),$(localedir $lang userpassword),$(localedir $lang other)}
-##     for pkg in $(ls /etc/pootle/po/sme7bp/templates/ | sed 's@\.pot@@')
-##     do
-## 	match=$(find /etc/pootle/cvs/smeserver/ -type f -regex ".*/e-smith/locale/$lang/.*/$pkg")
-## 	xmlgen /etc/pootle/po/sme7bp/$lang/$pkg.po > pootleupdate/$(localedir $lang $pkg)/$pkg
-## 	diff -u ${match:-/dev/null} pootleupdate/$(localedir $lang $pkg)/$pkg \
-## 	| sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/root/.*\)@\1 \2@' \
-## 	>> /var/www/html/patches/smeserver-locale-$lang-$(date +%F).patch
-##     done
-## 
-##     # Build contrib diffs
-##     for pkg in $(ls /etc/pootle/po/sme7cp/templates/ | sed 's@\.pot@@')
-##     do
-## 	match=$(find /etc/pootle/cvs/smecontribs/ -type f -regex ".*/e-smith/locale/$lang/.*/$pkg")
-## 	pkgname=$(find /etc/pootle/cvs/smecontribs/ -type f -regex ".*/e-smith/locale/en-us/.*/$pkg" | sed 's@.*/\([^/]\+\)/root/.*@\1@')
-## 	if [ ! -z "$pkgname" ]
-## 	then
-## 	    xmlgen /etc/pootle/po/sme7cp/$lang/$pkg.po > pootleupdate/$(localedir $lang $pkg)/$pkg
-## 	    diff -u ${match:-/dev/null} pootleupdate/$(localedir $lang $pkg)/$pkg \
-## 	    | sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/root/.*\)@\1 \2@' \
-## 	    >> /var/www/html/patches/contribs/$pkgname-locale-$(date +%F).patch
-## 	fi
-##     done
-## done
-## cat /var/www/html/patches/smeserver-locale-*-$(date +%F).patch > /var/www/html/patches/smeserver-locale-all-$(date +%F).patch
+# Build sme7admin diff
+pkg=$(ls -d smeserver-sme7admin-* | sed 's@.update$@@')
+orig=/etc/pootle/cvs/smecontribs/smeserver-sme7admin/*7/$pkg/po
+diff -ruN $orig $pkg.update/po \
+| sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/po/.*\)@\1 \2@;/^diff -ruN/d' \
+>> /var/www/html/patches/$pkg-locale-$(date +%F).patch
+