mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Locale now sneakily also recognizes lines marked as #_ADD
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1101 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -89,7 +89,10 @@ sub merge_locales {
|
||||
if ($what eq 'a') {
|
||||
# add
|
||||
for(my $k=0 ; $k < $len ; $pos_out++, $pos1++, $k++) {
|
||||
print "#_ADD", ($file1[$pos1] =~ /^\t/ ? '' : ' '), $file1[$pos1];
|
||||
my $line = $file1[$pos1];
|
||||
$line =~ s/^\xEF\xBB\xBF//; # eat BOM
|
||||
$line = "#_ADD" . ($line =~ /^\t/ ? '' : ' ') . $line;
|
||||
print $line;
|
||||
}
|
||||
} else {
|
||||
# delete
|
||||
|
||||
Reference in New Issue
Block a user