X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gen_locale.sh;h=0869511e078b10aad7b3ff09ba34a910790de429;hb=2ff25cd42d3b9dc62bf0977ce7a2ba0714ea7cbb;hp=e134e202133824fa90c00b77087daa3cfa74e302;hpb=a6c0303d21f5b0962f2088be8500af74daf3879e;p=gosa.git

diff --git a/gen_locale.sh b/gen_locale.sh
index e134e2021..0869511e0 100755
--- 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
@@ -40,7 +40,13 @@ echo "Merging po files with existing ones:"
 error=0
 for f in locale/??/LC_MESSAGES; do
   echo -n "* merging $f/messages.po: "
-  [ -f $f/messages.po ] && msgmerge $f/messages.po locale/messages.po --output-file=$f/messages.po.new &> /dev/null || /bin/true
+  [ -f $f/messages.po ] && msgmerge $f/messages.po locale/messages.po --output-file=$f/messages.po.new &> /dev/null
+
+  # Do an extra check for dummy dir 'locale/en/LC_MESSAGES'
+  if [ $? -ne 0 ]; then
+    [ "$f" == "locale/en/LC_MESSAGES" ] && /bin/true
+  fi
+
   if [ $? -eq 0 ]; then
     echo "done";
   else
@@ -78,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
@@ -90,9 +96,9 @@ cat << EOF
 
 ---------------------------------------------------------------------
 
-Now edit all files that have been replaced above (i.e. using kbabel)
-and mail the changes to gosa@oss.gonicus.de to be included in the
-next release.
+Now edit all files that have been replaced above (i.e. using kbabel
+or gtranslator) and mail the changes to gosa@oss.gonicus.de to be 
+included in the next release.
 
 To see the changes you've made in GOsa, run "msgfmt messages.po" on
 your freshly edited files and restart your apache after that. Set