Author: sveinung
Date: Wed Dec 23 15:59:24 2015
New Revision: 31166
URL: http://svn.gna.org/viewcvs/freeciv?rev=31166&view=rev
Log:
Use the ruleset defined action name in messages.
See bug #24221
Modified:
branches/S2_6/server/unithand.c
Modified: branches/S2_6/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unithand.c?rev=31166&r1=31165&r2=31166&view=diff
==============================================================================
--- branches/S2_6/server/unithand.c (original)
+++ branches/S2_6/server/unithand.c Wed Dec 23 15:59:24 2015
@@ -881,7 +881,7 @@
E_UNIT_ILLEGAL_ACTION, ftc_server,
_("Your %s can't do %s from %s."),
unit_name_translation(actor),
- gen_action_translated_name(stopped_action),
+ action_get_ui_name(stopped_action),
terrain_name_translation(expl->cant_act_from));
break;
case ANEK_IS_TRANSPORTED:
@@ -889,14 +889,14 @@
E_UNIT_ILLEGAL_ACTION, ftc_server,
_("Your %s can't do %s while being transported."),
unit_name_translation(actor),
- gen_action_translated_name(stopped_action));
+ action_get_ui_name(stopped_action));
break;
case ANEK_IS_NOT_TRANSPORTED:
notify_player(pplayer, unit_tile(actor),
E_UNIT_ILLEGAL_ACTION, ftc_server,
_("Your %s can't do %s while not being transported."),
unit_name_translation(actor),
- gen_action_translated_name(stopped_action));
+ action_get_ui_name(stopped_action));
break;
case ANEK_NO_WAR:
notify_player(pplayer, unit_tile(actor),
@@ -904,7 +904,7 @@
_("Your %s can't do %s while you"
" aren't at war with %s."),
unit_name_translation(actor),
- gen_action_translated_name(stopped_action),
+ action_get_ui_name(stopped_action),
player_name(expl->no_war_with));
break;
case ANEK_LOW_MP:
@@ -912,14 +912,14 @@
E_UNIT_ILLEGAL_ACTION, ftc_server,
_("Your %s has too few moves left to %s."),
unit_name_translation(actor),
- gen_action_translated_name(stopped_action));
+ action_get_ui_name(stopped_action));
break;
case ANEK_UNKNOWN:
notify_player(pplayer, unit_tile(actor),
E_UNIT_ILLEGAL_ACTION, ftc_server,
_("Your %s was unable to %s."),
unit_name_translation(actor),
- gen_action_translated_name(stopped_action));
+ action_get_ui_name(stopped_action));
break;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
