Index: branches/stable/l10n-kde4/x-test/internal/update_xx.sh =================================================================== --- branches/stable/l10n-kde4/x-test/internal/update_xx.sh (revision 1571952) +++ branches/stable/l10n-kde4/x-test/internal/update_xx.sh (revision 1571953) @@ -1,54 +1,55 @@ #! /usr/bin/env bash if cd templates; then list=`find messages -name "*.pot"` cd .. else echo "Cannot enter the templates directory. Aborting." exit 1 fi xx=x-test for i in $list; do test -z "$VERBOSE" || echo "# templates/$i" - tmpdest=$xx/`echo $i | sed -e "s/\.pot/.tmp/"` + tmpdest=$xx/`echo $i | sed -e "s/\.pot$/.tmp/"` destdir=`dirname $tmpdest` test -d $destdir || svn mkdir $destdir cp -p templates/$i $tmpdest - python $xx/internal/transxx.py $tmpdest + # FIXME: rewrite it so that it works with python3 + python2 $xx/internal/transxx.py $tmpdest dirname=$xx/`dirname $i` test -d $dirname || svn mkdir $dirname - dest=$xx/`echo $i | sed -e "s/\.pot/.po/"` + dest=$xx/`echo $i | sed -e "s/\.pot$/.po/"` msgfmt --check -o /dev/null $tmpdest &> /dev/null result=$? if [ $result -ne 0 ]; then echo "Skipping $dest due to errors!" # keep the wrong data around, to be able to debug transxx.py mv $tmpdest $dest.broken continue fi ### TODO: is this msgmerge still useful with transxx.py ? output=`msgmerge --no-fuzzy-matching -o $tmpdest $tmpdest templates/$i &> /tmp/updatextestresult` result=$? if [ -n "$VERBOSE" ]; then cat /tmp/updatextestresult fi if [ $result != 0 ] ; then echo "Merging failed for $dest" # keep the wrong data around, to be able to debug transxx.py mv $tmpdest $dest.broken continue fi ### TEMPORARY msgsplit is currently not used in KDE4 # ./scripts/msgsplit $tmpdest if test ! -f $dest; then mv $tmpdest $dest svn add $dest elif diff -q -I^\"PO-Revision-Date: $tmpdest $dest > /dev/null; then rm -f $tmpdest else mv $tmpdest $dest fi rm -f /tmp/updatextestresult done Index: branches/stable/l10n-kf5/x-test/internal/update_xx.sh =================================================================== --- branches/stable/l10n-kf5/x-test/internal/update_xx.sh (revision 1571952) +++ branches/stable/l10n-kf5/x-test/internal/update_xx.sh (revision 1571953) @@ -1,54 +1,55 @@ #! /usr/bin/env bash if cd templates; then list=`find messages -name "*.pot"` cd .. else echo "Cannot enter the templates directory. Aborting." exit 1 fi xx=x-test for i in $list; do test -z "$VERBOSE" || echo "# templates/$i" tmpdest=$xx/`echo $i | sed -e "s/\.pot$/.tmp/"` destdir=`dirname $tmpdest` test -d $destdir || svn mkdir $destdir cp -p templates/$i $tmpdest - python $xx/internal/transxx.py $tmpdest + # FIXME: rewrite it so that it works with python3 + python2 $xx/internal/transxx.py $tmpdest dirname=$xx/`dirname $i` test -d $dirname || svn mkdir $dirname dest=$xx/`echo $i | sed -e "s/\.pot$/.po/"` msgfmt --check -o /dev/null $tmpdest &> /dev/null result=$? if [ $result -ne 0 ]; then echo "Skipping $dest due to errors!" # keep the wrong data around, to be able to debug transxx.py mv $tmpdest $dest.broken continue fi ### TODO: is this msgmerge still useful with transxx.py ? output=`msgmerge --no-fuzzy-matching -o $tmpdest $tmpdest templates/$i &> /tmp/updatextestresult` result=$? if [ -n "$VERBOSE" ]; then cat /tmp/updatextestresult fi if [ $result != 0 ] ; then echo "Merging failed for $dest" # keep the wrong data around, to be able to debug transxx.py mv $tmpdest $dest.broken continue fi ### TEMPORARY msgsplit is currently not used in KDE4 # ./scripts/msgsplit $tmpdest if test ! -f $dest; then mv $tmpdest $dest svn add $dest elif diff -q -I^\"PO-Revision-Date: $tmpdest $dest > /dev/null; then rm -f $tmpdest else mv $tmpdest $dest fi rm -f /tmp/updatextestresult done Index: branches/stable/l10n-kf5-plasma-lts/x-test/internal/update_xx.sh =================================================================== --- branches/stable/l10n-kf5-plasma-lts/x-test/internal/update_xx.sh (revision 1571952) +++ branches/stable/l10n-kf5-plasma-lts/x-test/internal/update_xx.sh (revision 1571953) @@ -1,54 +1,55 @@ #! /usr/bin/env bash if cd templates; then list=`find messages -name "*.pot"` cd .. else echo "Cannot enter the templates directory. Aborting." exit 1 fi xx=x-test for i in $list; do test -z "$VERBOSE" || echo "# templates/$i" tmpdest=$xx/`echo $i | sed -e "s/\.pot$/.tmp/"` destdir=`dirname $tmpdest` test -d $destdir || svn mkdir $destdir cp -p templates/$i $tmpdest - python $xx/internal/transxx.py $tmpdest + # FIXME: rewrite it so that it works with python3 + python2 $xx/internal/transxx.py $tmpdest dirname=$xx/`dirname $i` test -d $dirname || svn mkdir $dirname dest=$xx/`echo $i | sed -e "s/\.pot$/.po/"` msgfmt --check -o /dev/null $tmpdest &> /dev/null result=$? if [ $result -ne 0 ]; then echo "Skipping $dest due to errors!" # keep the wrong data around, to be able to debug transxx.py mv $tmpdest $dest.broken continue fi ### TODO: is this msgmerge still useful with transxx.py ? output=`msgmerge --no-fuzzy-matching -o $tmpdest $tmpdest templates/$i &> /tmp/updatextestresult` result=$? if [ -n "$VERBOSE" ]; then cat /tmp/updatextestresult fi if [ $result != 0 ] ; then echo "Merging failed for $dest" # keep the wrong data around, to be able to debug transxx.py mv $tmpdest $dest.broken continue fi ### TEMPORARY msgsplit is currently not used in KDE4 # ./scripts/msgsplit $tmpdest if test ! -f $dest; then mv $tmpdest $dest svn add $dest elif diff -q -I^\"PO-Revision-Date: $tmpdest $dest > /dev/null; then rm -f $tmpdest else mv $tmpdest $dest fi rm -f /tmp/updatextestresult done Index: trunk/l10n-kf5/x-test/internal/update_xx.sh =================================================================== --- trunk/l10n-kf5/x-test/internal/update_xx.sh (revision 1571952) +++ trunk/l10n-kf5/x-test/internal/update_xx.sh (revision 1571953) @@ -1,54 +1,55 @@ #! /usr/bin/env bash if cd templates; then list=`find messages -name "*.pot"` cd .. else echo "Cannot enter the templates directory. Aborting." exit 1 fi xx=x-test for i in $list; do test -z "$VERBOSE" || echo "# templates/$i" tmpdest=$xx/`echo $i | sed -e "s/\.pot$/.tmp/"` destdir=`dirname $tmpdest` test -d $destdir || svn mkdir $destdir cp -p templates/$i $tmpdest - python $xx/internal/transxx.py $tmpdest + # FIXME: rewrite it so that it works with python3 + python2 $xx/internal/transxx.py $tmpdest dirname=$xx/`dirname $i` test -d $dirname || svn mkdir $dirname dest=$xx/`echo $i | sed -e "s/\.pot$/.po/"` msgfmt --check -o /dev/null $tmpdest &> /dev/null result=$? if [ $result -ne 0 ]; then echo "Skipping $dest due to errors!" # keep the wrong data around, to be able to debug transxx.py mv $tmpdest $dest.broken continue fi ### TODO: is this msgmerge still useful with transxx.py ? output=`msgmerge --no-fuzzy-matching -o $tmpdest $tmpdest templates/$i &> /tmp/updatextestresult` result=$? if [ -n "$VERBOSE" ]; then cat /tmp/updatextestresult fi if [ $result != 0 ] ; then echo "Merging failed for $dest" # keep the wrong data around, to be able to debug transxx.py mv $tmpdest $dest.broken continue fi ### TEMPORARY msgsplit is currently not used in KDE4 # ./scripts/msgsplit $tmpdest if test ! -f $dest; then mv $tmpdest $dest svn add $dest elif diff -q -I^\"PO-Revision-Date: $tmpdest $dest > /dev/null; then rm -f $tmpdest else mv $tmpdest $dest fi rm -f /tmp/updatextestresult done