From 9ef7e0528a30575551f74a4d3d35961b8b2c0222 Mon Sep 17 00:00:00 2001
From: Filip Komar <filip@mageia.org>
Date: Mon, 10 Mar 2014 22:17:22 +0000
Subject: 404 2nd page migrated to gettext system + small bugfix of toolchain
 needed

---
 tools/rebuild_gettext_catalogs.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/rebuild_gettext_catalogs.sh b/tools/rebuild_gettext_catalogs.sh
index 27c5115d3..93e78c8df 100755
--- a/tools/rebuild_gettext_catalogs.sh
+++ b/tools/rebuild_gettext_catalogs.sh
@@ -23,7 +23,7 @@ do
     error_in_source=$php_source
     errors[$php_source]=$php_sourc$php_error_level
     if [ -f ./langs/en/$resource.pot ]; then # cut too long lines
-        msgmerge --quiet ./langs/en/$resource.pot ./langs/en/$resource.pot > ./langs/en/$resource.tmp
+        msgmerge --quiet --no-wrap ./langs/en/$resource.pot ./langs/en/$resource.pot > ./langs/en/$resource.tmp
         mv ./langs/en/$resource.tmp ./langs/en/$resource.pot
 
         for directory in ./langs/*
@@ -32,6 +32,7 @@ do
             if [ -d $directory/ ] && [ $directory != ./langs/en ]; then
                 # create po file if needed from lang file if available
                 if [ ! -f $directory/$resource.po ] && [ -f $directory/$resource.*.lang ]; then
+#                    echo $directory # usefull for debuging of non UTF-8 files or other python errors
                     python tools/translated_converter.py --filename $directory/$resource
                     python_error_level=$? # catch python error level
                     if [ $python_error_level -gt 0 ]; then
@@ -41,8 +42,9 @@ do
                 fi
                 if [ -f $directory/$resource.po ]; then # update po file if it exists
 #                    msgfmt --statistics --verbose -c $directory/$resource.po -o /dev/null # usefull for debuging (msgctxt "/web/en/ or msgctxt "en/)
-                    msgmerge --update --quiet $directory/$resource.po ./langs/en/$resource.pot
+                    msgmerge --quiet --no-wrap $directory/$resource.po ./langs/en/$resource.pot > $directory/$resource.tmp
                     msgmerge_error_level=$? # catch msgmerge error level
+                    mv $directory/$resource.tmp $directory/$resource.po
 #                    msgfmt --statistics --verbose -c $directory/$resource.po -o /dev/null # usefull for debuging (msgctxt "/web/en/ or msgctxt "en/)
                     if [ $msgmerge_error_level -gt 0 ]; then
                         error=60
-- 
cgit v1.2.1