From 03573d876bb0d4b9aa0fe87fee1efc253e2c61a7 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Wed, 9 Jul 2014 00:16:59 +0200
Subject: [PATCH] Fix for #310

---
 levels-i18n/CMakeLists.txt                    |  8 +++++---
 levels-i18n/scripts/03_inject_translations.sh | 11 +++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/levels-i18n/CMakeLists.txt b/levels-i18n/CMakeLists.txt
index a017806a..be9649f1 100644
--- a/levels-i18n/CMakeLists.txt
+++ b/levels-i18n/CMakeLists.txt
@@ -38,10 +38,11 @@ foreach(levelfile ${levelfiles})
 	endif()
 	get_filename_component(_levelfile ${levelfile} NAME_WE)
 	if(PO4A AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${PODIR}")
+		file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/${PODIR}/*.po")
 		add_custom_command(OUTPUT ${_levels_i18n_target}/${_scenedest}
 			COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${_levels_i18n_target}
-			COMMAND ${LEVELS_I18N_PATH}/scripts/03_inject_translations.sh ${levelfile} ${CMAKE_CURRENT_BINARY_DIR}/${LEVEL_CODENAME}/${_levelfile} ${PODIR} > ${CMAKE_CURRENT_BINARY_DIR}/${_levels_i18n_target}/${_scenedest}
-			DEPENDS po4a-${LEVEL_CODENAME}
+			COMMAND ${LEVELS_I18N_PATH}/scripts/03_inject_translations.sh ${levelfile} ${CMAKE_CURRENT_BINARY_DIR}/${LEVEL_CODENAME}/${_levelfile} ${PODIR} ${CMAKE_CURRENT_BINARY_DIR}/${_levels_i18n_target}/${_scenedest}
+			DEPENDS po4a-${LEVEL_CODENAME} ${pofiles}
 			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 			COMMENT "${LEVEL_CODENAME}: Inject translation in ${_scenedest}"
 			)
@@ -104,10 +105,11 @@ add_custom_command(OUTPUT po4a-${LEVEL_CODENAME}.cfg
 
 if(PO4A AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${PODIR})
 	#### STEP 2 # Run po4a
+	file(GLOB pofiles "${CMAKE_CURRENT_SOURCE_DIR}/${PODIR}/*.po")
 	add_custom_command(OUTPUT po4a-ran-${LEVEL_CODENAME}
 			   COMMAND ${LEVELS_I18N_PATH}/scripts/02_run_po4a.sh ${LEVELS_I18N_PATH} ${CMAKE_CURRENT_BINARY_DIR}/po4a-${LEVEL_CODENAME}.cfg
 			   COMMAND touch po4a-ran-${LEVEL_CODENAME}
-			   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/po4a-${LEVEL_CODENAME}.cfg
+			   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/po4a-${LEVEL_CODENAME}.cfg ${pofiles}
 			   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 			   COMMENT "${LEVEL_CODENAME}: Run po4a to generate the translated files out of the .po files")
 	add_custom_target(po4a-${LEVEL_CODENAME} DEPENDS po4a-ran-${LEVEL_CODENAME})
diff --git a/levels-i18n/scripts/03_inject_translations.sh b/levels-i18n/scripts/03_inject_translations.sh
index de41b501..09c1f8d2 100755
--- a/levels-i18n/scripts/03_inject_translations.sh
+++ b/levels-i18n/scripts/03_inject_translations.sh
@@ -5,6 +5,7 @@ set -e
 levelfile=$1
 translations_prefix=$2
 PODIR=$3
+targetfile=$4
 
 rootfilename=$(basename $translations_prefix)
 
@@ -12,6 +13,8 @@ rootfilename=$(basename $translations_prefix)
 script_path=$(dirname $0)
 linguas=$(cd $PODIR/; ls *.po | sed -e 's/\.po$//g')
 
+echo -n "" > $targetfile
+
 # Make sure we take english (first, but it's not really important)
 for lang in en $linguas; do
 	dotlang=".$lang"
@@ -20,9 +23,9 @@ for lang in en $linguas; do
 	fi
 	i18nfile=$translations_prefix$dotlang.txt
 	if [ -f $i18nfile ]; then
-		sed -n '/^Title/p;/^Resume/p;/^ScriptName/p' $i18nfile
+		sed -n '/^Title/p;/^Resume/p;/^ScriptName/p' $i18nfile >> $targetfile
 	fi
 done
-echo "// End of level headers translations"
-echo ""
-sed -e '/^Title/d;/^Resume/d;/^ScriptName/d' $levelfile
+echo "// End of level headers translations" >> $targetfile
+echo "" >> $targetfile
+sed -e '/^Title/d;/^Resume/d;/^ScriptName/d' $levelfile >> $targetfile