--- builds_bin/update_templates	2010/03/04 18:16:04	1.13
+++ builds_bin/update_templates	2010/11/21 22:10:41	1.16
@@ -39,6 +39,9 @@ done
 
 cd /var/lib/pootle/tmp
 
+# Sync database stores to filesystem
+django-admin sync_stores --settings=pootle.settings &> /dev/null
+
 for ver in sme7 sme8
 do
     # Update anaconda template
@@ -52,7 +55,7 @@ do
     diffmv backup-console.pot /var/lib/pootle/po/$ver/templates/backup-console.pot
     potempl $(find /var/lib/pootle/cvs/smeserver/e-smith-manager/$ver/ -type f -name 25Copyright) > foot.tmpl.pot
     diffmv foot.tmpl.pot /var/lib/pootle/po/$ver/templates/foot.tmpl.pot
-    potempl $(find /var/lib/pootle/cvs/smeserver/*/$ver/ -type f -regex '.*/e-?smith/console.*') > server-console.pot
+    potempl $(find /var/lib/pootle/cvs/smeserver/*/$ver/ -type f -regex '.*/e-?smith/console.*' -not -regex '.*\+ldap/.*') > server-console.pot
     diffmv server-console.pot /var/lib/pootle/po/$ver/templates/server-console.pot
     potempl $(find /var/lib/pootle/cvs/smeserver/e-smith-quota/$ver/ -type f -name userOverQuota.tmpl) > userOverQuota.tmpl.pot
     diffmv userOverQuota.tmpl.pot /var/lib/pootle/po/$ver/templates/userOverQuota.tmpl.pot
@@ -93,7 +96,7 @@ for lang in $(ls -I templates /var/lib/p
 do
     # Create compendium to assist translations
     msgcat --use-first <(msgcat $(find /var/lib/pootle/tmp/errors/*/$lang/ -name '*.po') | msgattrib --translated --no-fuzzy) \
-                       <(msgcat $(find /var/lib/pootle/po/*/$lang/ -name '*.po') | msgattrib --translated --no-fuzzy) \
+                       <(msgcat --to-code UTF-8 $(find /var/lib/pootle/po/*/$lang/ -name '*.po') | msgattrib --translated --no-fuzzy) \
     > /var/lib/pootle/tmp/compendium-$lang.po
 
     # Use compendium to migrate each project to new template
@@ -125,8 +128,11 @@ rsync -amR --include '*/' --include '*.p
 
 #==========================================================
 
+# Sync filesystem to database stores
+django-admin update_stores --settings=pootle.settings &> /dev/null
+
 # Recalculate stats and restart server
-/usr/sbin/PootleServer --refreshstats &> /dev/null
+django-admin refresh_stats --settings=pootle.settings &> /dev/null
 
 #==========================================================