Fix small nits setected by wmllint, and wmllint itself.

This commit is contained in:
Eric S. Raymond 2010-08-12 20:08:22 +00:00
parent df75a95ffa
commit 2c86fcf4f0
3 changed files with 6 additions and 1 deletions

View file

@ -11,7 +11,9 @@
{WALL_TRANSITION2 (Dd^Cd,Dd^Kd) Xu (!,Dd^Cd,Dd^Kd,Xu) castle/dwarven-castle-wall}
{WALL_TRANSITION (Dd^Cd,Dd^Kd) (!,Xu,Qxu,Ql,Dd^Cd,Dd^Kd) castle/dwarven-castle}
# wmlscope: start ignoring
{OVERLAY *^Fi ../scenery/fire1.png:200,../scenery/fire2.png:200,../scenery/fire3.png:200,../scenery/fire4.png:200,../scenery/fire5.png:200,../scenery/fire6.png:200,../scenery/fire7.png:200,../scenery/fire8.png:200}
# wmlscope: stop ignoring
{TERRAIN_BASE Wyc water/coast}

View file

@ -637,11 +637,13 @@
[/else]
[/if]
# wmllint: display on
{VARIABLE ai_controller_{AFFIX}.main_menu_message.message "$ai_controller_{AFFIX}.main_menu_message.message"+"
<span color='black'>-</span>"+"
"+_"Objective: $ai_controller.side_$ally_side|_current_settings.currently_doing_objective_description
Behavior: $ai_controller.side_$ally_side|_current_settings.currently_doing_behavior_description"+"
<span color='black'>-</span>"}
# wmllint: display off
[set_variables]
name=ai_controller_{AFFIX}.main_menu_message.option

View file

@ -653,6 +653,7 @@ translatables = (\
"name_inactive",
"note",
"option_description",
"option_name",
"order",
"plural_name",
"prefix",
@ -1878,7 +1879,7 @@ def translator(filename, mapxforms, textxform):
display_state = True
elif re.match(" *wmllint: *display +off", transformed[i:]):
display_state = False
elif transformed[i] == '"':
elif transformed[i] == '"' and not display_state:
quotecount += 1
if quotecount % 2 == 0:
singleline = False