--- builds_bin/functions	2009/06/07 17:11:51	1.6
+++ builds_bin/functions	2010/03/02 21:16:48	1.7
@@ -52,31 +52,32 @@ diffcp() {
 
 potempl() {
     xgettext --from-code UTF-8 -L perl -o - $@ \
-    | sed 's@charset=CHARSET@charset=UTF-8@;s@[^ ]*/root/@root/@g;s@Project-Id-Version.*\\n@Project-Id-Version: SME Console\\n@' \
+    | sed 's@charset=CHARSET@charset=UTF-8@;s@[^ ]\+/\([^/]\+\)/[^/]\+/root/@\1/root/@g;s@Id-Version.*\\n@Id-Version: SME Template\\n@' \
     | sed '/Report-Msgid-Bugs-To/d;/POT-Creation-Date/d;/PO-Revision-Date/d;/Language-Team/d;/X-Generator/d;0,/^msgid/{/^#/d}' \
     | msgcat -F -t UTF-8 -
 }
 
 xmltempl() {
-    mkdir -p /etc/pootle/tmp/templates /etc/pootle/templates
+    mkdir -p /var/lib/pootle/templates/$1/
 
-    root=$(echo $1 | sed 's@.*/root/@root/@')
-    cat $1 \
+    root=$(echo $2 | sed 's@.*/root/@root/@')
+    cat $2 \
     | perl -pe 's@<@_{_@g;s@>@_}_@g;s@&@_AMP_@g;s@_{_(/?(?:lexicon|entry|base|trans).*?)_}_@<$1>@g' \
     | sed '/<\\\?lexicon/p;0,/<lexicon/d;/<\\lexicon/,$d' \
-    | tee /etc/pootle/tmp/templates/$(basename $1).orig \
-    | xml2po -m sme -e -o - - \
-    | sed "/(lexicon)/{N;N;N;d};s@-\(:[0-9]\+([^)]\+)\)@$root\1@g" \
+    > /var/lib/pootle/tmp/$(basename $2).orig
+
+    xml2po -m sme -e -o - /var/lib/pootle/tmp/$(basename $2).orig \
+    | sed "/(lexicon)/{N;N;N;d};s@[^ ]\+\(:[0-9]\+([^)]\+)\)@$1/$root\1@g" \
     | tee >(cat - |  sed '/^msgid/{p;s@msgid@msgstr@p;N;d}' \
-		  | xml2po -m sme -p - /etc/pootle/tmp/templates/$(basename $1).orig \
-		  > /etc/pootle/tmp/templates/$(basename $1) ) \
+		  | xml2po -m sme -p - /var/lib/pootle/tmp/$(basename $2).orig \
+		  > /var/lib/pootle/tmp/$(basename $2) ) \
     | perl -pe 's@_AMP_@&@g;s@_{_@<@g;s@_}_@>@g' \
     | msgcat -F -t UTF-8 - \
-    | sed "/^\"POT-Creation-Date:/d;s@Project-Id-Version.*\\\n@Project-Id-Version: $2\\\n@" \
-    > /etc/pootle/tmp/templates/$(basename $1).pot
-    diffmv /etc/pootle/tmp/templates/$(basename $1).orig /etc/pootle/templates/$(basename $1).orig
-    diffmv /etc/pootle/tmp/templates/$(basename $1) /etc/pootle/templates/$(basename $1)
-    diffmv /etc/pootle/tmp/templates/$(basename $1).pot /etc/pootle/templates/$(basename $1).pot
+    | sed "/^\"POT-Creation-Date:/d;s@Id-Version.*\\\n@Id-Version: SME Template\\\n@" \
+    > /var/lib/pootle/tmp/$(basename $2).pot
+    diffmv /var/lib/pootle/tmp/$(basename $2).orig /var/lib/pootle/templates/$1/$(basename $2).orig
+    diffmv /var/lib/pootle/tmp/$(basename $2) /var/lib/pootle/templates/$1/$(basename $2)
+    diffmv /var/lib/pootle/tmp/$(basename $2).pot /var/lib/pootle/templates/$1/$(basename $2).pot
 }
 
 anacondatmpl() {
@@ -84,59 +85,53 @@ anacondatmpl() {
 	     -k=_ \
 	     -k=N_ \
 	     -o - \
-	     $(sed -n '/\.py/s@^\([^ \t]\+\)[ \t]\+\([^/]\+\)\(/.*\)\?@/etc/pootle/cvs/smeserver/\2/sme7/\2-*\3/\1@p' \
-		   /etc/pootle/cvs/smeserver/cdrom.image/sme7/updates/README.txt) \
-	     $(sed -n '/\.py/s@^\([^ \t]\+\)[ \t]\+\([^/]\+\)\(/.*\)\?@/etc/pootle/cvs/smeserver/\2/sme8/\2-*\3/\1@p' \
-		   /etc/pootle/cvs/smeserver/cdrom.image/sme8/updates/README.txt) \
-	     /etc/pootle/cvs/smeserver/cdrom.image/sme7/updates/*.py \
-	     /etc/pootle/cvs/smeserver/cdrom.image/sme7/product/installclasses/*.py \
-	     /etc/pootle/cvs/smeserver/cdrom.image/sme8/updates/*.py \
-	     /etc/pootle/cvs/smeserver/cdrom.image/sme8/updates/installclasses/*.py \
-    | sed 's@charset=CHARSET@charset=UTF-8@;s@Project-Id-Version.*\\n@Project-Id-Version: SME Anaconda\\n@' \
-    | sed 's@/etc/pootle/cvs/smeserver/[^/]\+/@@' \
+	     $(sed -n "/\.py/s@^\([^ \t]\+\)[ \t]\+\([^/]\+\)\(/.*\)\?@/var/lib/pootle/cvs/smeserver/\2/$1/\2-*\3/\1@p" \
+		   /var/lib/pootle/cvs/smeserver/cdrom.image/$1/updates/README.txt) \
+	     /var/lib/pootle/cvs/smeserver/cdrom.image/$1/updates/*.py \
+	     /var/lib/pootle/cvs/smeserver/cdrom.image/$1/*/installclasses/*.py \
+    | sed 's@charset=CHARSET@charset=UTF-8@;s@Id-Version.*\\n@Id-Version: SME Template\\n@' \
+    | sed 's@/var/lib/pootle/cvs/smeserver/[^/]\+/@@' \
     | msgcat -u \
 	     --use-first \
 	     - \
-	     <(sed 's@CHARSET@UTF-8@' /etc/pootle/cvs/smeserver/anaconda/sme7/anaconda-*/po/anaconda.pot) \
-	     <(sed 's@CHARSET@UTF-8@' /etc/pootle/cvs/smeserver/anaconda/sme7/anaconda-*/po/anaconda.pot) \
-	     <(sed 's@CHARSET@UTF-8@' /etc/pootle/cvs/smeserver/anaconda/sme8/anaconda-*/po/anaconda.pot) \
-	     <(sed 's@CHARSET@UTF-8@' /etc/pootle/cvs/smeserver/anaconda/sme8/anaconda-*/po/anaconda.pot) \
+	     <(sed 's@CHARSET@UTF-8@' /var/lib/pootle/cvs/smeserver/anaconda/$1/anaconda-*/po/anaconda.pot) \
+	     <(sed 's@CHARSET@UTF-8@' /var/lib/pootle/cvs/smeserver/anaconda/$1/anaconda-*/po/anaconda.pot) \
     | sed '/Report-Msgid-Bugs-To/d;/POT-Creation-Date/d;/PO-Revision-Date/d;/Last-Translator/d;/Language-Team/d;/X-Generator/d;0,/^msgid/{/^#/d}' \
     | msgcat -F -t UTF-8 -
 }
 
 xmltrans() {
-    if [ ! -f /etc/pootle/templates/$(basename $1) ]
+    if [ ! -f /var/lib/pootle/templates/$1/$(basename $2) ]
     then
-	echo "Missing /etc/pootle/templates/$(basename $1)"
-    elif [ ! -f /etc/pootle/templates/$(basename $1).pot ]
+	echo "Missing /var/lib/pootle/templates/$1/$(basename $2)"
+    elif [ ! -f /var/lib/pootle/templates/$1/$(basename $2).pot ]
     then
-	echo "Missing /etc/pootle/templates/$(basename $1).pot"
+	echo "Missing /var/lib/pootle/templates/$1/$(basename $2).pot"
     else
 	#| iconv -f ISO-8859-1 -t UTF-8 \
-	#lang=$(echo $1 | sed 's@.*/locale/\([^/]\+\)/.*@\1@')
-	cat $1 \
+	#lang=$(echo $2 | sed 's@.*/locale/\([^/]\+\)/.*@\1@')
+	cat $2 \
 	| perl -pe 's@<@_{_@g;s@>@_}_@g;s@&@_AMP_@g;s@_{_(/?(?:lexicon|entry|base|trans).*?)_}_@<$1>@g' \
 	| sed '/<\\\?lexicon/p;0,/<lexicon/d;/<\\lexicon/,$d' \
-	| xml2po -m sme -r - -o - /etc/pootle/templates/$(basename $1) \
+	| xml2po -m sme -r - -o - /var/lib/pootle/templates/$1/$(basename $2) \
 	| perl -pe 's@_AMP_@&@g;s@_{_@<@g;s@_}_@>@g' \
 	| sed "/(lexicon)/{N;N;N;d}" \
 	| msgcat -F -t UTF-8 - \
-	| msgmerge -q -F - /etc/pootle/templates/$(basename $1).pot
+	| msgmerge -q -F - /var/lib/pootle/templates/$1/$(basename $2).pot
     fi
 }
 
 xmlgen() {
-    if [ ! -f /etc/pootle/templates/$(basename $1 | sed 's@\.pot\?$@@') ]
+    if [ ! -f /var/lib/pootle/templates/$1/$(basename $2 | sed 's@\.pot\?$@@') ]
     then
-	echo "Missing /etc/pootle/templates/$(basename $1 | sed 's@\.pot\?$@@')" 1>&2
+	echo "Missing /var/lib/pootle/templates/$1/$(basename $2 | sed 's@\.pot\?$@@')" 1>&2
     else
-	#lang=$(basename $(dirname $1))
-	msgcat -F $1 \
+	#lang=$(basename $(dirname $2))
+	msgcat -F $2 \
 	| perl -pe 's@<@_{_@g;s@>@_}_@g;s@&@_AMP_@g' \
         | sed '/#,/d' | sed '1,/X-Generator/{;s,_{_,<,g;s,_}_,>,g;s,_AMP_,\&,g;}' \
 	| sed '/#,/d' \
-	| xml2po -m sme -p - /etc/pootle/templates/$(basename $1 | sed 's@\.pot\?$@@') \
+	| xml2po -m sme -p - /var/lib/pootle/templates/$1/$(basename $2 | sed 's@\.pot\?$@@') \
 	| sed '1d' \
 	| perl -pe 's@_AMP_@&@g;s@_{_@<@g;s@_}_@>@g' \
 	| perl -pe 's@(lexicon\s+lang[^"]+"[^"]+)_([^"]+)"@"$1-".lc($2)."\""@e'
@@ -144,17 +139,17 @@ xmlgen() {
 }
 
 anacondagen() {
-    if [ -f /etc/pootle/cvs/smeserver/anaconda/$1/anaconda-*/po/$2.po ]
+    if [ -f /var/lib/pootle/cvs/smeserver/anaconda/$1/anaconda-*/po/$2.po ]
     then
 	msgcat --use-first \
-	       /etc/pootle/cvs/smeserver/anaconda/$1/anaconda-*/po/$2.po \
-	       /etc/pootle/po/sme7bc/$2/anaconda.po \
+	       /var/lib/pootle/cvs/smeserver/anaconda/$1/anaconda-*/po/$2.po \
+	       /var/lib/pootle/po/$1/$2/anaconda.po \
 	| msgfmt -f -o - - 2> /dev/null
 	if [ $? -ne 0 ]
 	then
 	    msgcat --use-first \
-		   /etc/pootle/cvs/smeserver/anaconda/$1/anaconda-*/po/$2.po \
-		   /etc/pootle/po/sme7bc/$2/anaconda.po \
+		   /var/lib/pootle/cvs/smeserver/anaconda/$1/anaconda-*/po/$2.po \
+		   /var/lib/pootle/po/$1/$2/anaconda.po \
 	    | msgfmt -o - - 2> /dev/null
 	fi
     fi