Several winstation fixes from 2.5

[gosa.git] / gen_locale.sh

diff --git a/gen_locale.sh b/gen_locale.sh
index 8b70dc40a4738e79cf477de8ac5361f255af005b..a57cea5464bd276e2d745c3523f1e0038fcf5431 100755 (executable)
--- a/gen_locale.sh
+++ b/gen_locale.sh
@@ -22,7 +22,7 @@ for template in $(find -name '*.tpl'); do
 done
 
 for class in $(find -name 'class_*.inc'); do
-  echo -en "\rConverting .tpl files: $(basename $template)                 \r"
+  echo -en "\rConverting class_*.inc files: $(basename $template)                 \r"
   sed -e 's/\($pl[DH][^=]*\)= *"\([^"]*\)";$/\1= _("\2");/g' $class > $class.new
   mv $class.new $class
 done
@@ -34,7 +34,7 @@ mv contrib/gosa.conf.new contrib/gosa.conf
 
 echo "Extracting languages..."
 rm locale/messages.po
-(echo contrib/gosa.conf; find . -name '*.[ctpi][ophn][nlpc]') | xgettext -f - --omit-header --keyword=must -d Domain -L PHP -n -o locale/messages.po
+(echo contrib/gosa.conf; find . -name '*.[ctpi][ophn][nlpc]') | xgettext -f - --keyword=must -d Domain -L PHP -n -o locale/messages.po
 
 echo "Merging po files with existing ones:"
 error=0
@@ -84,7 +84,7 @@ if [ $error -eq 0 ]; then
   read -p "Do you want to erase the message.po.orig files? (y/n)" -n1 ans
 
   if [ "$ans" == "y" -o "$ans" == "Y" ]; then
-    find $ORIG -type f -name 'messages.po.orig' -exec rm -f {} \;
+    find $ORIG/ -type f -name 'messages.po.orig' -exec rm -f {} \;
   fi
 
 else