Clear up a bunch of minor string FIXMes from before 1.8.
This commit is contained in:
Eric S. Raymond
parent
08fd768ae3
commit
d32c0205dc
6 changed files with 20 additions and 21 deletions
|
|
@ -377,12 +377,12 @@
|
|||
message= _ "WHO GOES THERE?"
|
||||
[/message]
|
||||
[message]
|
||||
role=Supporter
|
||||
message= _ "Oops, I spoke too soon."
|
||||
speaker=Hamel
|
||||
message= _ "(<i>Wince</i>)."
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Hamel
|
||||
message= _ "(<i>Wince</i>) You can turn the volume down, pal." # FIXME 'Turn the volume down'?! Archaic dialogue FTW!
|
||||
role=Supporter
|
||||
message= _ "Oops, I spoke too soon."
|
||||
[/message]
|
||||
[message]
|
||||
speaker=Camerin
|
||||
|
|
|
|||
|
|
@ -2058,7 +2058,7 @@
|
|||
|
||||
[message]
|
||||
speaker=Troll Chieftain
|
||||
message= _ "Destroy the invaders! Make them pay for their slaughter!" #FIXME 'Pay for their slaughter' doesn’t make sense.
|
||||
message= _ "Destroy the invaders! Make them pay for the murders they have done!"
|
||||
[/message]
|
||||
[/event]
|
||||
|
||||
|
|
@ -2439,7 +2439,7 @@
|
|||
|
||||
[message]
|
||||
speaker=$explorer.id
|
||||
message= _ "There is a chasm here cutting off the end of the crypt. It must be rather recent, it cuts off the path leading to a rather ornate stone coffin." #FIXME Poor phrasing
|
||||
message= _ "There is a chasm here cutting off the end of the crypt. It must be rather recent; the edges are still raw and crumbling. It cuts off the path leading to a rather ornate stone coffin."
|
||||
[/message]
|
||||
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
|
|||
|
|
@ -1068,9 +1068,7 @@ To move your troops onto that island without wading slowly through the water, yo
|
|||
{PRINT (_"Advance other units and capture villages, then <b>End Turn</b>")}
|
||||
[/then]
|
||||
[else]
|
||||
# FIXME: use name of unit doing attack - use $unit.type
|
||||
# Do that after String-Freeze!!
|
||||
{STUDENT (_"No other units can reach that orc. I hope my archer survives its counter-attack! I’d better grab more villages and move everyone closer for next turn.")}
|
||||
{STUDENT (_"No other units can reach that orc. I hope my $unit.type survives its counter-attack! I’d better grab more villages and move everyone closer for next turn.")}
|
||||
{TEACHER (_"Yes. If your Shaman stands just behind that unit on the bridge, she will heal it at the beginning of the next turn.")}
|
||||
{PRINT (_"Move your Shaman onto the bridge to stand behind your other unit")}
|
||||
[event]
|
||||
|
|
|
|||
|
|
@ -235,9 +235,8 @@ Share knowledge of warfare"
|
|||
|
||||
# Giving Money
|
||||
|
||||
# FIXME: After 1.8, pangoize these headings to green
|
||||
[option]
|
||||
message= {MENU_IMG_TXT "items/gold-coins-small.png" (_"Donate Funds
|
||||
message= {MENU_IMG_TXT "items/gold-coins-small.png" (_"<span color='green'>Donate Funds</span>
|
||||
Give 20 gold to another player")}
|
||||
[command]
|
||||
{VARIABLE finished_suboptions no}
|
||||
|
|
@ -269,9 +268,8 @@ Give 20 gold to another player")}
|
|||
|
||||
# Sharing Knowledge
|
||||
|
||||
# FIXME: After 1.8, pangoize these headings to green
|
||||
[option]
|
||||
message= {MENU_IMG_TXT "items/book4.png" (_"Share Knowledge
|
||||
message= {MENU_IMG_TXT "items/book4.png" (_"<span color='green'>Share Knowledge</span>
|
||||
Help an ally with their research")}
|
||||
[command]
|
||||
{VARIABLE finished_suboptions no}
|
||||
|
|
@ -316,9 +314,8 @@ Help an ally with their research")}
|
|||
|
||||
# Dwarves
|
||||
|
||||
# FIXME: After 1.8, pangoize these headings to green
|
||||
[option]
|
||||
message= {MENU_IMG_TXT "units/dwarves/lord.png~TC(1,magenta)" (_"Negotiate with the Dwarves
|
||||
message= {MENU_IMG_TXT "units/dwarves/lord.png~TC(1,magenta)" (_"<span color='green'>Negotiate with the Dwarves</span>
|
||||
Lets you recruit a Dwarvish unit
|
||||
Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$side_number|.leader_option_1.target")}
|
||||
[show_if]
|
||||
|
|
@ -343,9 +340,8 @@ Negotiation Progress: $player_$side_number|.leader_option_1.progress|/$player_$s
|
|||
|
||||
# Elves
|
||||
|
||||
# FIXME: After 1.8, pangoize these headings to green
|
||||
[option]
|
||||
message= {MENU_IMG_TXT "units/elves-wood/marshal.png~TC(1,magenta)" (_"Negotiate with the Elves
|
||||
message= {MENU_IMG_TXT "units/elves-wood/marshal.png~TC(1,magenta)" (_"<span color='green'>Negotiate with the Elves</a>
|
||||
Lets you recruit an Elvish unit
|
||||
Negotiation Progress: $player_$side_number|.leader_option_2.progress|/$player_$side_number|.leader_option_2.target")}
|
||||
[show_if]
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ Study Progress: $player_$side_number|.farming.progress|/$player_$side_number|.fa
|
|||
|
||||
# FIXME: After 1.8, pangoize so first line is green
|
||||
[option]
|
||||
message= {MENU_IMG_TXT "items/gold-coins-small.png" (_"Mining
|
||||
message= {MENU_IMG_TXT "items/gold-coins-small.png" (_"<span color='green'>Mining</span>
|
||||
Miners produce +1 gold
|
||||
Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.mining.target")}
|
||||
[command]
|
||||
|
|
@ -141,9 +141,8 @@ Study Progress: $player_$side_number|.mining.progress|/$player_$side_number|.min
|
|||
|
||||
#Warfare
|
||||
|
||||
# FIXME: After 1.8, pangoize so first line is green
|
||||
[option]
|
||||
message= {MENU_IMG_TXT "wesnoth-icon.png" (_"Warfare
|
||||
message= {MENU_IMG_TXT "wesnoth-icon.png" (_"<span color='green'>Warfare</span>
|
||||
Allows you to recruit a new type of unit
|
||||
Study Progress: $player_$side_number|.warfare.progress|/$player_$side_number|.warfare.target")}
|
||||
[show_if]
|
||||
|
|
|
|||
|
|
@ -951,7 +951,13 @@ def global_sanity_check(filename, lines):
|
|||
# Detect units that speak in their death events
|
||||
filter_subject = None
|
||||
die_event = False
|
||||
deathcheck = True
|
||||
for nav in WmllintIterator(lines, filename):
|
||||
if nav.text.startswith("wmllint: deathcheck off"):
|
||||
deathcheck = False
|
||||
continue
|
||||
elif nav.text.startswith("wmllint: deathcheck on"):
|
||||
notecheck = True
|
||||
if "[/event]" in nav.text:
|
||||
filter_subject = None
|
||||
die_event = False
|
||||
|
|
@ -980,7 +986,7 @@ def global_sanity_check(filename, lines):
|
|||
if fields:
|
||||
(key, prefix, value, comment) = fields
|
||||
if key in ("id", "speaker"):
|
||||
if (value == filter_subject) or (value == "unit"):
|
||||
if deathcheck and (value == filter_subject) or (value == "unit"):
|
||||
print '"%s", line %d: %s speaks in his/her death event' % (filename, nav.lineno+1, value)
|
||||
# Collect information on defined movement types and races
|
||||
for nav in WmllintIterator(lines, filename):
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue