[Wesnoth-cvs-commits] wesnoth/utils wmlxgettext

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/11/09 00:06:43

Modified files:
        utils          : wmlxgettext 

Log message:
        behave properly when WML files have msdos line-endings in multiline 
strings

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/utils/wmlxgettext.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: wesnoth/utils/wmlxgettext
diff -u wesnoth/utils/wmlxgettext:1.8 wesnoth/utils/wmlxgettext:1.9
--- wesnoth/utils/wmlxgettext:1.8       Thu Oct 21 19:54:38 2004
+++ wesnoth/utils/wmlxgettext   Tue Nov  9 00:06:42 2004
@@ -37,7 +37,7 @@
       $_ = $3;
       redo LINE;
 
-    } elsif (!defined $str and m/^(?:[^\"]*?)((?:_\s*)?)\s*\"([^\"]*)/) {
+    } elsif (!defined $str and m/^(?:[^\"]*?)((?:_\s*)?)\s*\"([^\"]*)\r?/) {
       # start of multi-line
 
       $translatable = ($1 ne '');
@@ -60,6 +60,7 @@
 
     } elsif (defined $str) {
       # part of multi-line
+      if (m/(.*)\r/) { $_ = $1; }
       $str .= $_;
 
     } elsif (m/(\S+)\s*=\s*(.*?)\s*$/) {