[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[801]

[<dom...@us...>]

Revision: 801
          http://sourceforge.net/p/fvwm-crystal/code/801
Author:   dominique_libre
Date:     2015-11-30 15:07:06 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
Alwin: avoid loops in make.pot; music-cdcd: fix polish charachters

Modified Paths:
--------------
    ChangeLog
    addons/make.pot
    fvwm/components/functions/Music-cdcd

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-11-26 10:22:14 UTC (rev 800)
+++ ChangeLog	2015-11-30 15:07:06 UTC (rev 801)
@@ -3,6 +3,10 @@
 Version 3.4.0
 -------------
 
+Lundi 30 novembre 2015
+  addons/make.pot: avoid loops by Alwin.
+  functions/music-cdcd: fix polish charachters by Alwin.
+
 Jeudi 26 novembre 2015, Patch by Alwin:
   addons/README: Small text update.
   addons/fvwm-crystal-*.pot: Few new strings.

Modified: addons/make.pot
===================================================================
--- addons/make.pot	2015-11-26 10:22:14 UTC (rev 800)
+++ addons/make.pot	2015-11-30 15:07:06 UTC (rev 801)
@@ -2,13 +2,14 @@
 
 # POT file creator (or PO file updater) for FVWM-Crystal
 #
-# Version:	3.4.0 (rev. 788)
+# Version:	3.4.0 (rev. 800)
 # Licence:	GPL 2+
 #
 # Author:	Alwin <tra...@zi...>
 #
 # Created:	<12/11/2015>
 # Changed:	<17/11/2015>	Description added.
+#		<26/11/2015>	Prevent infinite loops better.
 #
 # Description:	The purpose of this script, is to generate gettext
 # 		templates for localization of FVWM-Crystal. Support for
@@ -177,11 +178,10 @@
 		>$i.pot
 
 
+COUNT1="$(wc -l .make.pot.tmp | sed -e 's/\([[:digit:]]*\).*/\1/')"
+
 # Create rest of pot file from tmp file
 while [ -s .make.pot.tmp ]; do
-	# Prevent infinite loops
-	grep -e "]${STRING}\$" .make.pot.tmp && exit 1
-
 	STRING="$(sed \
 		-e '1!d' \
 		-e 's/.*]\([^]]*\)/\1/' \
@@ -203,6 +203,15 @@
 	fi
 
 	sed -i -e "\\]\\]${STRING}\$]d" .make.pot.tmp
+
+	# Prevent infinite loops
+	COUNT2="$(wc -l .make.pot.tmp | sed -e 's/\([[:digit:]]*\).*/\1/')"
+
+	if [ "$COUNT2" -lt "$COUNT1" ]; then
+		COUNT1="$COUNT2"
+	else
+		echo "Error: infinite loop"; exit 1
+	fi
 done
 
 echo '# End of generated strings' >>$i.pot

Modified: fvwm/components/functions/Music-cdcd
===================================================================
--- fvwm/components/functions/Music-cdcd	2015-11-26 10:22:14 UTC (rev 800)
+++ fvwm/components/functions/Music-cdcd	2015-11-30 15:07:06 UTC (rev 801)
@@ -1,6 +1,6 @@
 # Support for CDCD CDAudio player into Fvwm-Crystal
 # Written by: Maciej Delmanowski <ha...@po...>
-# sed commands by: Grzegorz Niew\xEAg\xB3owski <ho...@do...>
+# sed commands by: Grzegorz Niewęgłowski <ho...@do...>
 # Modifications, debugging and improvments by Dominique Michel
 # <dom...@us...> 2008-2013
 # See ChangeLog for details

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.