0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wmllint: don't add description to [attack] tags within [filter_wml]

Browse source 
This fixes situation when wmllint tried to add description=_"fireball"
to the following WML code:

[filter]
    [filter_wml]
        [not]
            [attack]
                name=fireball
            [/attack]
        [/not]
    [/filter_wml]
[/filter]

Tags within [filter_wml] don't need to have all mandatory arguments
(like "description"), because:
1) they are temporary constructs and this description is never used,
2) such WML code expects that results will be filtered ONLY by name.
Adding description will remove results that have the same attack name
but different description.
This commit is contained in:
Edward Chernenko 2018-12-18 21:22:03 +03:00 • committed by Elvish_Hunter
parent 0ebb5f01e9
commit 5462d36561
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/tools/wmllint
View file

@ -2316,11 +2316,17 @@ def hack_syntax(filename, lines):
print('"%s", line %d: %s -> %s -- DO NOT PREFIX PATHS WITH "userdata/"' \
% (filename, i+1, userdata.group(), userdata.group(1)))
lines[i] = precomment + comment
# Ensure that every attack has a translatable description.
in_filter_wml = False
for i in range(len(lines)):
if "no-syntax-rewrite" in lines[i]:
break
elif "[filter_wml]" in lines[i]:
in_filter_wml = True
elif "[/filter_wml]" in lines[i]:
in_filter_wml = False
elif "[attack]" in lines[i]:
j = i
have_description = False
@ -2342,7 +2348,7 @@ def hack_syntax(filename, lines):
description = '"' + description + '"\n'
# Skip the insertion if this is a dummy declaration
# or one modifying an attack inherited from a base unit.
if "no-icon" not in comment:
if "no-icon" not in comment and not in_filter_wml:
new_line = leader(syntactic) + "description=_"+description
if verbose:
print('"%s", line %d: inserting %s' % (filename, i+1, repr(new_line)))