diff --git a/gen_locale.sh b/gen_locale.sh
index e134e202133824fa90c00b77087daa3cfa74e302..ed89fdcf8a3ecb4cf6a2e6cfe799103519893868 100755 (executable)
--- a/gen_locale.sh
+++ b/gen_locale.sh
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
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