Author: noyga
Date: Sat Aug 23 23:58:13 2008
New Revision: 28907
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28907&view=rev
Log:
More macro inside string fixes ... Marked the remaining one with FIXMEs
Modified:
trunk/data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg
Modified: trunk/data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg?rev=28907&r1=28906&r2=28907&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg (original)
+++ trunk/data/multiplayer/scenarios/ANL_utils/ANL_leader_options.cfg Sat Aug
23 23:58:13 2008
@@ -1,7 +1,8 @@
#textdomain wesnoth-anl
#define DONATE_FUNDS_OPTION TARGET_SIDE
[option]
- message= _ "@$player_{TARGET_SIDE}.name"
+ # don't try to translate this one
+ message= "@$player_{TARGET_SIDE}.name"
[show_if]
{CONDITION leader.gold greater_than_equal_to 20}
[have_unit]
@@ -10,10 +11,17 @@
[/have_unit]
[/show_if]
[command]
+ [set_variable]
+ name=df_player_name
+ value=$player_{TARGET_SIDE}.name
+ [/set_variable]
[message]
speaker=unit
- message= _ "I hereby donate 20 gold to the coffers of
$player_{TARGET_SIDE}.name|."
+ message= _ "I hereby donate 20 gold to the coffers of
$df_player_name|."
[/message]
+ [clear_variable]
+ name=df_player_name
+ [/clear_variable]
{ADD_GOLD {TARGET_SIDE} 20}
{ADD_GOLD $side_number -20}
{VARIABLE_OP leader.gold add -20}
@@ -28,6 +36,7 @@
#define SHARE_FARMING_KNOWLEDGE_OPTION TARGET_SIDE
[option]
+ # FIXME: need to fix this translatable string not using a macro inside it
message= {MENU_IMG_TXT "items/flower4.png" _"@$player_{TARGET_SIDE}.name
Share knowledge of agriculture"}
[show_if]
@@ -44,16 +53,24 @@
{VARIABLE unit.status.worked_this_turn yes}
{VARIABLE unit.moves 0}
{REDRAW}
+ [set_variable]
+ name=sf_player_name
+ value=$player_{TARGET_SIDE}.name
+ [/set_variable]
[message]
speaker=unit
- message= _ "$player_{TARGET_SIDE}.name|, since our wisdom exceeds
yours I have instructed my scholars to further your understanding of
agriculture."
+ message= _ "$sf_player_name|, since our wisdom exceeds yours I
have instructed my scholars to further your understanding of agriculture."
[/message]
+ [clear_variable]
+ name=sf_player_name
+ [/clear_variable]
[/command]
[/option]
#enddef
#define SHARE_MINING_KNOWLEDGE_OPTION TARGET_SIDE
[option]
+ # FIXME: need to fix this translatable string not using a macro inside it
message= {MENU_IMG_TXT "items/gold-coins-small.png"
_"@$player_{TARGET_SIDE}.name
Share knowledge of mining"}
[show_if]
@@ -70,16 +87,24 @@
{VARIABLE unit.status.worked_this_turn yes}
{VARIABLE unit.moves 0}
{REDRAW}
+ [set_variable]
+ name=sm_player_name
+ value=$player_{TARGET_SIDE}.name
+ [/set_variable]
[message]
speaker=unit
- message= _ "$player_{TARGET_SIDE}.name|, since the wisdom of my
people exceeds yours I have instructed my scholars to aid you in your efforts
to learn the science of mining."
+ message= _ "$sm_player_name|, since the wisdom of my people
exceeds yours I have instructed my scholars to aid you in your efforts to learn
the science of mining."
[/message]
+ [clear_variable]
+ name=sm_player_name
+ [/clear_variable]
[/command]
[/option]
#enddef
#define SHARE_WARFARE_KNOWLEDGE_OPTION TARGET_SIDE
[option]
+ # FIXME: need to fix this translatable string not using a macro inside it
message= {MENU_IMG_TXT "wesnoth-icon.png" _"@$player_{TARGET_SIDE}.name
Share knowledge of warfare"}
[show_if]
@@ -96,10 +121,17 @@
{VARIABLE unit.status.worked_this_turn yes}
{VARIABLE unit.moves 0}
{REDRAW}
+ [set_variable]
+ name=sw_player_name
+ value=$player_{TARGET_SIDE}.name
+ [/set_variable]
[message]
speaker=unit
- message= _ "You know worryingly little about the arts of war,
$player_{TARGET_SIDE}.name|. I feel an obligation to instruct you in this vital
matter."
+ message= _ "You know worryingly little about the arts of war,
$sw_player_name|. I feel an obligation to instruct you in this vital matter."
[/message]
+ [clear_variable]
+ name=sw_player_name
+ [/clear_variable]
[/command]
[/option]
#enddef
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
