CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <[EMAIL PROTECTED]> 04/11/09 00:27:46
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.9&tr2=1.10&r1=text&r2=text
Patches:
Index: wesnoth/utils/wmlxgettext
diff -u wesnoth/utils/wmlxgettext:1.9 wesnoth/utils/wmlxgettext:1.10
--- wesnoth/utils/wmlxgettext:1.9 Tue Nov 9 00:06:42 2004
+++ wesnoth/utils/wmlxgettext Tue Nov 9 00:27:46 2004
@@ -37,11 +37,13 @@
$_ = $3;
redo LINE;
- } elsif (!defined $str and m/^(?:[^\"]*?)((?:_\s*)?)\s*\"([^\"]*)\r?/) {
+ } elsif (!defined $str and m/^(?:[^\"]*?)((?:_\s*)?)\s*\"([^\"]*)/) {
# start of multi-line
$translatable = ($1 ne '');
- $str = $2;
+ $_ = $2;
+ if (m/(.*)\r/) { $_ = $1; }
+ $str = $_;
$line = $.;
} elsif (m/(.*?)\"(.*)$/) {
