Author: sveinung Date: Thu Oct 22 11:08:57 2015 New Revision: 30164 URL: http://svn.gna.org/viewcvs/freeciv?rev=30164&view=rev Log: SDL clients: Use ruleset defined action ui names
for Establish Trade Route and Help Build Wonder. See patch #6455 Modified: branches/S2_6/client/gui-sdl/menu.c branches/S2_6/client/gui-sdl2/menu.c Modified: branches/S2_6/client/gui-sdl/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/menu.c?rev=30164&r1=30163&r2=30164&view=diff ============================================================================== --- branches/S2_6/client/gui-sdl/menu.c (original) +++ branches/S2_6/client/gui-sdl/menu.c Thu Oct 22 11:08:57 2015 @@ -841,7 +841,8 @@ /* --------- */ /* Form Trade route */ - fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Establish Trade Route"), "R"); + fc_snprintf(cBuf, sizeof(cBuf), "%s (%s)", + action_get_ui_name(ACTION_TRADE_ROUTE), "R"); pBuf = create_themeicon(current_theme->OTrade_Icon, Main.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND | WF_WIDGET_HAS_INFO_LABEL); @@ -886,7 +887,8 @@ /* --------- */ /* Help Build Wonder */ - fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Help Build Wonder"), "B"); + fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", + action_get_ui_name(ACTION_HELP_WONDER), "B"); pBuf = create_themeicon(current_theme->OWonder_Icon, Main.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND | WF_WIDGET_HAS_INFO_LABEL); @@ -1146,14 +1148,16 @@ if (can_establish_trade_route(pHomecity, pCity)) { fc_snprintf(cBuf, sizeof(cBuf), - _("Establish Trade Route With %s ( %d one time bonus + %d trade ) (R)"), + _("%s With %s ( %d one time bonus + %d trade ) (R)"), + action_get_ui_name(ACTION_TRADE_ROUTE), city_name(pHomecity), revenue, trade_between_cities(pHomecity, pCity)); } else { revenue = (revenue + 2) / 3; fc_snprintf(cBuf, sizeof(cBuf), - _("Trade With %s ( %d one time bonus ) (R)"), + _("%s Of %s ( %d one time bonus ) (R)"), + action_get_ui_name(ACTION_MARKETPLACE), city_name(pHomecity), revenue); } Modified: branches/S2_6/client/gui-sdl2/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/menu.c?rev=30164&r1=30163&r2=30164&view=diff ============================================================================== --- branches/S2_6/client/gui-sdl2/menu.c (original) +++ branches/S2_6/client/gui-sdl2/menu.c Thu Oct 22 11:08:57 2015 @@ -827,7 +827,8 @@ /* --------- */ /* Establish Trade route */ - fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Establish Trade Route"), "R"); + fc_snprintf(cBuf, sizeof(cBuf), "%s (%s)", + action_get_ui_name(ACTION_TRADE_ROUTE), "R"); pBuf = create_themeicon(current_theme->OTrade_Icon, Main.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND | WF_WIDGET_HAS_INFO_LABEL); @@ -868,7 +869,8 @@ /* --------- */ /* Help Build Wonder */ - fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Help Build Wonder"), "B"); + fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", + action_get_ui_name(ACTION_HELP_WONDER), "B"); pBuf = create_themeicon(current_theme->OWonder_Icon, Main.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND | WF_WIDGET_HAS_INFO_LABEL); @@ -1121,14 +1123,16 @@ if (can_establish_trade_route(pHomecity, pCity)) { fc_snprintf(cBuf, sizeof(cBuf), - _("Establish Trade Route With %s ( %d one time bonus + %d trade ) (R)"), + _("%s With %s ( %d one time bonus + %d trade ) (R)"), + action_get_ui_name(ACTION_TRADE_ROUTE), city_name(pHomecity), revenue, trade_between_cities(pHomecity, pCity)); } else { revenue = (revenue + 2) / 3; fc_snprintf(cBuf, sizeof(cBuf), - _("Trade With %s ( %d one time bonus ) (R)"), + _("%s Of %s ( %d one time bonus ) (R)"), + action_get_ui_name(ACTION_MARKETPLACE), city_name(pHomecity), revenue); } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits