X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=util%2Frun_xgettext.sh;h=0ceda68133f4c4e7c52525ce2f48be01c7d3d97a;hb=2f79e98cda109a7c79507c30fb3b9c570e5e9e0f;hp=ec11bbcb856beb38dba80b54afe85b4598ada984;hpb=22c45b9bf1950a3be157f340475158a87d41c2fb;p=friendica.git

diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index ec11bbcb85..0ceda68133 100755
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -30,18 +30,6 @@ F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.p
 
 echo "Friendica version $F9KVERSION"
 
-OPTS=
-
-#if [ "" != "$1" ]
-#then
-#	OUTFILE="$(readlink -f ${FULLPATH}/$1)"
-#	if [ -e "$OUTFILE" ]
-#	then
-#		echo "join extracted strings"
-#		OPTS="-j"
-#	fi
-#fi
-
 KEYWORDS="-k -kt -ktt:1,2"
 
 echo "extract strings to $OUTFILE.."
@@ -50,7 +38,8 @@ for f in $(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f)
 do
 	if [ ! -d "$f" ]
 	then
-		xgettext $KEYWORDS $OPTS -j -o "$OUTFILE" --from-code=UTF-8 "$f"
+		xgettext $KEYWORDS -j -o "$OUTFILE" --from-code=UTF-8 "$f"
+		sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
 	fi
 done
 
@@ -74,4 +63,11 @@ else
 	sed -i "s/^\"Plural-Forms.*$//g" "$OUTFILE"
 fi
 
+if [ "" != "$1" -a "$ADDONMODE" == "" ]
+then
+	UPDATEFILE="$(readlink -f ${FULLPATH}/$1)"
+	echo "merging new strings to $UPDATEFILE.."
+	msgmerge -U $OUTFILE $UPDATEFILE
+fi
+
 echo "done."