X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=util%2Frun_xgettext.sh;h=75f85786a846874d3131865637e1ba7a89945d36;hb=836058c47745f502890a209dfd6efcb3596ace84;hp=b39b75820165b47c3b092fe8c5757afbf7d5d0f7;hpb=079c638403a3722119e54bf55c189de5d92cbcf1;p=friendica.git

diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index b39b758201..75f85786a8 100755
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -12,7 +12,7 @@ then
 fi
 
 if [ $ADDONMODE ]
-then 
+then
 	cd "$FULLPATH/../addon/$ADDONNAME"
 	mkdir -p "$FULLPATH/../addon/$ADDONNAME/lang/C"
 	OUTFILE="$FULLPATH/../addon/$ADDONNAME/lang/C/messages.po"
@@ -23,46 +23,36 @@ else
 	OUTFILE="$FULLPATH/messages.po"
 	FINDSTARTDIR="../../"
 	# skip addon folder
-	FINDOPTS="-wholename */addon -prune -o"
+	FINDOPTS="( -wholename */addon -or -wholename */smarty3 ) -prune -o"
 fi
 
 F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php);
 
 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.."
+rm "$OUTFILE"; touch "$OUTFILE"
 for f in $(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f)
 do
 	if [ ! -d "$f" ]
 	then
-		xgettext $KEYWORDS $OPTS -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
 
 echo "setup base info.."
 if [ $ADDONMODE ]
-then 
+then
 	sed -i "s/SOME DESCRIPTIVE TITLE./ADDON $ADDONNAME/g" "$OUTFILE"
 	sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE"
 	sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE"
 	sed -i "s/PACKAGE VERSION//g" "$OUTFILE"
 	sed -i "s/PACKAGE/Friendica $ADDONNAME addon/g" "$OUTFILE"
 	sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
-	sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE"
+	sed -i "s/^\"Plural-Forms.*$//g" "$OUTFILE"
 else
 	sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDICA Distributed Social Network/g" "$OUTFILE"
 	sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011, 2012, 2013 the Friendica Project/g" "$OUTFILE"
@@ -70,7 +60,14 @@ else
 	sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
 	sed -i "s/PACKAGE/Friendica/g" "$OUTFILE"
 	sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
-	sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE"
+	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."