diff --git a/gen_locale.sh b/gen_locale.sh
index 77c733109748595704caa2006970dfc708065fdf..9f57ca906d49fb64815d59fdc2b9e633004de0bf 100755 (executable)
--- a/gen_locale.sh
+++ b/gen_locale.sh
ORIG=`pwd`
TEMPDIR="/tmp/gosa-locale"
+TRUE=`which true`
echo
echo "Creating temporary directory..."
pushd . &> /dev/null
cd $TEMPDIR
-for template in $(find -name '*.tpl'); do
+for template in $(find . -name '*.tpl'); do
echo -en "\rConverting .tpl files: $(basename $template) \r"
sed -e 's/{t}/<?php $t= _("/g;s!{/t}!");?>!g' $template > $template.new
mv $template.new $template
done
-for class in $(find -name 'class_*.inc'); do
- echo -en "\rConverting .tpl files: $(basename $template) \r"
+for class in $(find . -name 'class_*.inc'); do
+ 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
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: "
- 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" ] && $TRUE
+ fi
+
if [ $? -eq 0 ]; then
echo "done";
else
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
---------------------------------------------------------------------
-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