Author: sveinung Date: Thu Oct 22 11:07:53 2015 New Revision: 30162 URL: http://svn.gna.org/viewcvs/freeciv?rev=30162&view=rev Log: SDL 2 client: Use ruleset defined action ui names
for Establish Trade Route, Help Build Wonder, Join City and Found City. See patch #6455 Modified: trunk/client/gui-sdl2/mapctrl.c trunk/client/gui-sdl2/menu.c Modified: trunk/client/gui-sdl2/mapctrl.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/mapctrl.c?rev=30162&r1=30161&r2=30162&view=diff ============================================================================== --- trunk/client/gui-sdl2/mapctrl.c (original) +++ trunk/client/gui-sdl2/mapctrl.c Thu Oct 22 11:07:53 2015 @@ -2786,7 +2786,8 @@ pNewCity_Dlg = fc_calloc(1, sizeof(struct SMALL_DLG)); /* create window */ - pstr = create_utf8_from_char(_("Build City"), adj_font(12)); + pstr = create_utf8_from_char(action_get_ui_name(ACTION_FOUND_CITY), + adj_font(12)); pstr->style |= TTF_STYLE_BOLD; pWindow = create_window_skeleton(NULL, pstr, 0); pWindow->action = move_new_city_dlg_callback; Modified: trunk/client/gui-sdl2/menu.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/menu.c?rev=30162&r1=30161&r2=30162&view=diff ============================================================================== --- trunk/client/gui-sdl2/menu.c (original) +++ trunk/client/gui-sdl2/menu.c Thu Oct 22 11:07:53 2015 @@ -828,7 +828,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); @@ -869,7 +870,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); @@ -881,8 +883,10 @@ /* --------- */ /* Add to City / Build New City */ - fc_snprintf(cBuf, sizeof(cBuf), "%s (%s)", _("Add to City"), "B"); - fc_snprintf(cBuf, sizeof(cBuf), "%s (%s)", _("Build City"), "B"); + fc_snprintf(cBuf, sizeof(cBuf), "%s (%s)", + action_get_ui_name(ACTION_JOIN_CITY), "B"); + fc_snprintf(cBuf, sizeof(cBuf), "%s (%s)", + action_get_ui_name(ACTION_FOUND_CITY), "B"); pBuf = create_themeicon(current_theme->OBuildCity_Icon, Main.gui, WF_HIDDEN | WF_RESTORE_BACKGROUND @@ -1072,9 +1076,11 @@ if (unit_can_add_or_build_city(pUnit)) { if (pCity) { - fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Add to City"), "B"); - } else { - fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Build City"), "B"); + fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", + action_get_ui_name(ACTION_JOIN_CITY), "B"); + } else { + fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", + action_get_ui_name(ACTION_FOUND_CITY), "B"); } copy_chars_to_utf8_str(pOrder_Build_AddTo_City_Button->info_label, cBuf); @@ -1122,14 +1128,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