Author: sveinung
Date: Wed Feb 24 13:49:22 2016
New Revision: 32060

URL: http://svn.gna.org/viewcvs/freeciv?rev=32060&view=rev
Log:
Flag names are translated.

Have universal_name_translation() translate tech, terrain, unit type, road
and base flag names.

See bug #24442

Modified:
    trunk/common/requirements.c

Modified: trunk/common/requirements.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.c?rev=32060&r1=32059&r2=32060&view=diff
==============================================================================
--- trunk/common/requirements.c (original)
+++ trunk/common/requirements.c Wed Feb 24 13:49:22 2016
@@ -3227,8 +3227,7 @@
     return buf;
   case VUT_TECHFLAG:
     cat_snprintf(buf, bufsz, _("\"%s\" tech"),
-                 /* flag names are never translated */
-                 tech_flag_id_name(psource->value.techflag));
+                 tech_flag_id_translated_name(psource->value.techflag));
     return buf;
   case VUT_GOVERNMENT:
     fc_strlcat(buf, government_name_translation(psource->value.govern),
@@ -3283,8 +3282,8 @@
     cat_snprintf(buf, bufsz,
                  /* TRANS: Unit type flag */
                  Q_("?utflag:\"%s\" units"),
-                 /* flag names are never translated */
-                 unit_type_flag_id_name(psource->value.unitflag));
+                 unit_type_flag_id_translated_name(
+                   psource->value.unitflag));
     return buf;
   case VUT_UCLASS:
     cat_snprintf(buf, bufsz,
@@ -3391,21 +3390,19 @@
     cat_snprintf(buf, bufsz,
                  /* TRANS: Terrain flag */
                  Q_("?terrflag:\"%s\" terrain"),
-                 /* flag names are never translated */
-                 terrain_flag_id_name(psource->value.terrainflag));
+                 terrain_flag_id_translated_name(
+                   psource->value.terrainflag));
     return buf;
   case VUT_BASEFLAG:
     cat_snprintf(buf, bufsz,
                  /* TRANS: Base flag */
                  Q_("?baseflag:\"%s\" base"),
-                 /* flag names are never translated */
-                 base_flag_id_name(psource->value.baseflag));
+                 base_flag_id_translated_name(psource->value.baseflag));
   case VUT_ROADFLAG:
     cat_snprintf(buf, bufsz,
                  /* TRANS: Road flag */
                  Q_("?roadflag:\"%s\" road"),
-                 /* flag names are never translated */
-                 road_flag_id_name(psource->value.roadflag));
+                 road_flag_id_translated_name(psource->value.roadflag));
   case VUT_MINYEAR:
     cat_snprintf(buf, bufsz, _("After %s"),
                  textyear(psource->value.minyear));


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

Reply via email to