X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibzypp.git;a=blobdiff_plain;f=mkChangelog;h=52cb498d6c1e988f0dd1092a32a3a4cac0a1af99;hp=82ba3681332b441009cda8e4335034e790df48e0;hb=HEAD;hpb=f83c725ce0c3bacc81ee5a7a991cafa6c53446da

diff --git a/mkChangelog b/mkChangelog
index 82ba368..6d4303e 100755
--- a/mkChangelog
+++ b/mkChangelog
@@ -48,7 +48,13 @@ esac
 
 export LC_ALL=""
 export LANG="en"
-EDITOR=${EDITOR:-vi}
+
+function Edit()
+{
+  local FILE="$1"
+  vi "$FILE"
+  sed -i 's/ \+$//' "$FILE"
+}
 
 EMAIL="$(git config --get user.email)"
 
@@ -101,7 +107,10 @@ function sameVersion() {
 }
 
 function getchanges() {
-  git log --no-merges --pretty=format:'- %s' "$LAST_RELEASE"..HEAD | grep -v 'po.tar.bz2'
+  git log --no-merges --pretty=format:'@@%B' "$LAST_RELEASE"..HEAD	\
+  | awk '/^@@/{p=1}/^@@Translated using Weblate/{p=0}(p){print}'	\
+  | sed '/./{H;$!d};x;/./{s/ *\n */ /g;s/^ *//;s/ *$//;/[^]})!?:.]$/s/$/./;p};d'	\
+  | fold -s -w 66 | sed '/^@@/{s/^../- /;p;d};s/^/  /'
 }
 
 function newchangesentry() {
@@ -165,7 +174,7 @@ while true; do
     echo
     case "${RES:-e}" in
       [eE]*)
-	$EDITOR $VERSIONFILE
+	Edit $VERSIONFILE
 	eval $(getversion)
 	continue
 	;;
@@ -207,7 +216,7 @@ trap " [ -f \"$TMPFILE\" ] && /bin/rm -f -- \"$TMPFILE\" " 0 1 2 3 13 15
 
 RES=e
 while [ "$RES" == "e" ]; do
-  $EDITOR $TMPFILE
+  Edit $TMPFILE
   echo
   awk '{print}/^----------/{n=n+1; if ( n == 2 ) exit 0; }' $TMPFILE
   read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (s)ubmitt, (e)dit [e]: ")" RES