Author: esr
Date: Tue Sep 30 16:24:41 2008
New Revision: 29788
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29788&view=rev
Log:
Pacify wmllint about some legitimate macro uses.
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
trunk/data/tools/wmllint
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg?rev=29788&r1=29787&r2=29788&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
Tue Sep 30 16:24:41 2008
@@ -40,7 +40,7 @@
condition=lose
[/objective]
- note={NEW_GOLD_CARRYOVER_NOTE_40}
+ note=_ "" + {NEW_GOLD_CARRYOVER_NOTE_40}
[/objectives]
[/event]
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg?rev=29788&r1=29787&r2=29788&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
Tue Sep 30 16:24:41 2008
@@ -34,7 +34,7 @@
condition=lose
[/objective]
- note={NEW_GOLD_CARRYOVER_NOTE_40}
+ note=_ "" + {NEW_GOLD_CARRYOVER_NOTE_40}
[/objectives]
[/event]
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg?rev=29788&r1=29787&r2=29788&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
Tue Sep 30 16:24:41 2008
@@ -35,7 +35,7 @@
condition=lose
[/objective]
- note={NEW_GOLD_CARRYOVER_NOTE_40}
+ note=_ "" + {NEW_GOLD_CARRYOVER_NOTE_40}
[/objectives]
[/event]
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg?rev=29788&r1=29787&r2=29788&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
Tue Sep 30 16:24:41 2008
@@ -30,7 +30,7 @@
condition=lose
[/objective]
- note={NEW_GOLD_CARRYOVER_NOTE_40}
+ note=_ "" + {NEW_GOLD_CARRYOVER_NOTE_40}
[/objectives]
[/event]
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg?rev=29788&r1=29787&r2=29788&view=diff
==============================================================================
---
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
(original)
+++
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
Tue Sep 30 16:24:41 2008
@@ -37,7 +37,7 @@
condition=lose
[/objective]
- note={NEW_GOLD_CARRYOVER_NOTE_40}
+ note=_ "" + {NEW_GOLD_CARRYOVER_NOTE_40}
[/objectives]
[/event]
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg?rev=29788&r1=29787&r2=29788&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Tue Sep 30 16:24:41 2008
@@ -150,7 +150,7 @@
condition=lose
[/objective]
- note={NEW_GOLD_CARRYOVER_NOTE_20}
+ note=_ "" + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
#ifdef HARD
Modified: trunk/data/tools/wmllint
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=29788&r1=29787&r2=29788&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Tue Sep 30 16:24:41 2008
@@ -525,7 +525,11 @@
if key == 'role':
present.append(value)
if has_tr_mark:
- if '{' in value:
+ # FIXME: This test is rather bogus as is.
+ # Doing a better job would require tokenizing to pivk up the
+ # string boundaries. I'd do it, but AI0867 is already working
+ # on a parser-based wmllint.
+ if '{' in value and "+" not in value:
print '"%s", line %d: macro reference in translatable
string'\
% (filename, i+1)
if future and re.search("[.,!?] ", lines[i]):
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
