mirror of
https://github.com/wesnoth/wesnoth
synced 2025-04-24 08:35:21 +00:00
behave properly when WML files have msdos line-endings in multiline strings
This commit is contained in:
parent
effbd0f306
commit
840ad864aa
@ -37,7 +37,7 @@ foreach my $file (@ARGV) {
|
||||
$_ = $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 @@ foreach my $file (@ARGV) {
|
||||
|
||||
} elsif (defined $str) {
|
||||
# part of multi-line
|
||||
if (m/(.*)\r/) { $_ = $1; }
|
||||
$str .= $_;
|
||||
|
||||
} elsif (m/(\S+)\s*=\s*(.*?)\s*$/) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user