Fixed tagging.

[gosa.git] / gen_locale.sh

diff --git a/gen_locale.sh b/gen_locale.sh
index 77c733109748595704caa2006970dfc708065fdf..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
 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
   sed -e 's/\($pl[DH][^=]*\)= *"\([^"]*\)";$/\1= _("\2");/g' $class > $class.new
   mv $class.new $class
 done


@@ -34,14 +34,19 @@ mv contrib/gosa.conf.new contrib/gosa.conf
 
 echo "Extracting languages..."
 rm locale/messages.po
 
 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
 for f in locale/??/LC_MESSAGES; do
   echo -n "* merging $f/messages.po: "
 
 echo "Merging po files with existing ones:"
 error=0
 for f in locale/??/LC_MESSAGES; do
   echo -n "* merging $f/messages.po: "

-  msgmerge $f/messages.po locale/messages.po --output-file=$f/messages.po.new &> /dev/null
-  
+  [ -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
   if [ $? -eq 0 ]; then
     echo "done";
   else


@@ -79,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
   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
   fi
 
 else


@@ -91,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
 
 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