Author: cazfi
Date: Tue May 12 23:18:26 2015
New Revision: 29075

URL: http://svn.gna.org/viewcvs/freeciv?rev=29075&view=rev
Log:
Translate citizen nationality display column headers.

Reported by Jacob Nevins <jtn>

See bug #23443

Modified:
    branches/S2_4/client/gui-gtk-2.0/citizensinfo.c
    branches/S2_4/client/gui-gtk-3.0/citizensinfo.c

Modified: branches/S2_4/client/gui-gtk-2.0/citizensinfo.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-2.0/citizensinfo.c?rev=29075&r1=29074&r2=29075&view=diff
==============================================================================
--- branches/S2_4/client/gui-gtk-2.0/citizensinfo.c     (original)
+++ branches/S2_4/client/gui-gtk-2.0/citizensinfo.c     Tue May 12 23:18:26 2015
@@ -55,7 +55,7 @@
 static struct citizens_column {
   bool show;
   enum player_dlg_column_type type;
-  const char *title;                   /* already translated */
+  const char *title;
   const char *(*func)(const struct city *, const struct player_slot *);
                                        /* if type = COL_*TEXT */
   const char *tagname;                 /* for save_options */
@@ -198,14 +198,14 @@
     switch (pcol->type) {
     case COL_FLAG:
       renderer = gtk_cell_renderer_pixbuf_new();
-      col = gtk_tree_view_column_new_with_attributes(pcol->title, renderer,
+      col = gtk_tree_view_column_new_with_attributes(_(pcol->title), renderer,
               "pixbuf", i, NULL);
       break;
     case COL_TEXT:
       renderer = gtk_cell_renderer_text_new();
       g_object_set(renderer, "style-set", TRUE, "weight-set", TRUE, NULL);
 
-      col = gtk_tree_view_column_new_with_attributes(pcol->title, renderer,
+      col = gtk_tree_view_column_new_with_attributes(_(pcol->title), renderer,
               "text", i,
               "style", CITIZENS_DLG_COL_STYLE,
               "weight", CITIZENS_DLG_COL_WEIGHT,
@@ -216,7 +216,7 @@
       renderer = gtk_cell_renderer_text_new();
       g_object_set(renderer, "style-set", TRUE, "weight-set", TRUE, NULL);
 
-      col = gtk_tree_view_column_new_with_attributes(pcol->title, renderer,
+      col = gtk_tree_view_column_new_with_attributes(_(pcol->title), renderer,
               "text", i,
               "style", CITIZENS_DLG_COL_STYLE,
               "weight", CITIZENS_DLG_COL_WEIGHT,

Modified: branches/S2_4/client/gui-gtk-3.0/citizensinfo.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-3.0/citizensinfo.c?rev=29075&r1=29074&r2=29075&view=diff
==============================================================================
--- branches/S2_4/client/gui-gtk-3.0/citizensinfo.c     (original)
+++ branches/S2_4/client/gui-gtk-3.0/citizensinfo.c     Tue May 12 23:18:26 2015
@@ -55,7 +55,7 @@
 static struct citizens_column {
   bool show;
   enum player_dlg_column_type type;
-  const char *title;                   /* already translated */
+  const char *title;
   const char *(*func)(const struct city *, const struct player_slot *);
                                        /* if type = COL_*TEXT */
   const char *tagname;                 /* for save_options */
@@ -199,14 +199,14 @@
     switch (pcol->type) {
     case COL_FLAG:
       renderer = gtk_cell_renderer_pixbuf_new();
-      col = gtk_tree_view_column_new_with_attributes(pcol->title, renderer,
+      col = gtk_tree_view_column_new_with_attributes(_(pcol->title), renderer,
               "pixbuf", i, NULL);
       break;
     case COL_TEXT:
       renderer = gtk_cell_renderer_text_new();
       g_object_set(renderer, "style-set", TRUE, "weight-set", TRUE, NULL);
 
-      col = gtk_tree_view_column_new_with_attributes(pcol->title, renderer,
+      col = gtk_tree_view_column_new_with_attributes(_(pcol->title), renderer,
               "text", i,
               "style", CITIZENS_DLG_COL_STYLE,
               "weight", CITIZENS_DLG_COL_WEIGHT,
@@ -217,7 +217,7 @@
       renderer = gtk_cell_renderer_text_new();
       g_object_set(renderer, "style-set", TRUE, "weight-set", TRUE, NULL);
 
-      col = gtk_tree_view_column_new_with_attributes(pcol->title, renderer,
+      col = gtk_tree_view_column_new_with_attributes(_(pcol->title), renderer,
               "text", i,
               "style", CITIZENS_DLG_COL_STYLE,
               "weight", CITIZENS_DLG_COL_WEIGHT,


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

Reply via email to