Author: sveinung
Date: Sun May  3 18:38:08 2015
New Revision: 28979

URL: http://svn.gna.org/viewcvs/freeciv?rev=28979&view=rev
Log:
Gtk clients: Use ruleset defined action ui names in menu items.

See patch #6060

Modified:
    branches/S2_6/client/gui-gtk-2.0/menu.c
    branches/S2_6/client/gui-gtk-3.0/menu.c

Modified: branches/S2_6/client/gui-gtk-2.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/menu.c?rev=28979&r1=28978&r2=28979&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/menu.c     (original)
+++ branches/S2_6/client/gui-gtk-2.0/menu.c     Sun May  3 18:38:08 2015
@@ -2274,7 +2274,9 @@
                       units_have_type_flag(punits, UTYF_NUCLEAR, TRUE));
 
   if (units_can_do_action(punits, ACTION_HELP_WONDER, TRUE)) {
-    menus_rename(unit_group, "BUILD_CITY", _("Help _Build Wonder"));
+    menus_rename(unit_group, "BUILD_CITY",
+                 action_prepare_ui_name(ACTION_HELP_WONDER,
+                                        "_", ACTPROB_NA, NULL));
   } else {
     bool city_on_tile = FALSE;
 
@@ -2296,7 +2298,9 @@
   }
 
   if (units_can_do_action(punits, ACTION_TRADE_ROUTE, TRUE)) {
-    menus_rename(unit_group, "BUILD_ROAD", _("Establish Trade _Route"));
+    menus_rename(unit_group, "BUILD_ROAD",
+                 action_prepare_ui_name(ACTION_TRADE_ROUTE,
+                                        "_", ACTPROB_NA, NULL));
   } else if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) {
     char road_item[500];
     struct extra_type *pextra = NULL;

Modified: branches/S2_6/client/gui-gtk-3.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/menu.c?rev=28979&r1=28978&r2=28979&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/menu.c     (original)
+++ branches/S2_6/client/gui-gtk-3.0/menu.c     Sun May  3 18:38:08 2015
@@ -2275,7 +2275,9 @@
                       units_have_type_flag(punits, UTYF_NUCLEAR, TRUE));
 
   if (units_can_do_action(punits, ACTION_HELP_WONDER, TRUE)) {
-    menus_rename(unit_group, "BUILD_CITY", _("Help _Build Wonder"));
+    menus_rename(unit_group, "BUILD_CITY",
+                 action_prepare_ui_name(ACTION_HELP_WONDER,
+                                        "_", ACTPROB_NA, NULL));
   } else {
     bool city_on_tile = FALSE;
 
@@ -2297,7 +2299,9 @@
   }
 
   if (units_can_do_action(punits, ACTION_TRADE_ROUTE, TRUE)) {
-    menus_rename(unit_group, "BUILD_ROAD", _("Establish Trade _Route"));
+    menus_rename(unit_group, "BUILD_ROAD",
+                 action_prepare_ui_name(ACTION_TRADE_ROUTE,
+                                        "_", ACTPROB_NA, NULL));
   } else if (units_have_type_flag(punits, UTYF_SETTLERS, TRUE)) {
     char road_item[500];
     struct extra_type *pextra = NULL;


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to