Author: sveinung Date: Sun Mar 13 01:42:56 2016 New Revision: 32236 URL: http://svn.gna.org/viewcvs/freeciv?rev=32236&view=rev Log: Make extra flag names translatable.
See patch #7054 Modified: trunk/common/extras.h trunk/common/requirements.c trunk/server/cityturn.c trunk/translations/core/POTFILES.in Modified: trunk/common/extras.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/extras.h?rev=32236&r1=32235&r2=32236&view=diff ============================================================================== --- trunk/common/extras.h (original) +++ trunk/common/extras.h Sun Mar 13 01:42:56 2016 @@ -27,34 +27,34 @@ #define SPECENUM_NAME extra_flag_id /* Tile with this extra is considered native for units in tile. */ #define SPECENUM_VALUE0 EF_NATIVE_TILE -#define SPECENUM_VALUE0NAME "NativeTile" +#define SPECENUM_VALUE0NAME N_("?extraflag:NativeTile") /* Refuel native units */ #define SPECENUM_VALUE1 EF_REFUEL -#define SPECENUM_VALUE1NAME "Refuel" +#define SPECENUM_VALUE1NAME N_("?extraflag:Refuel") #define SPECENUM_VALUE2 EF_TERR_CHANGE_REMOVES -#define SPECENUM_VALUE2NAME "TerrChangeRemoves" +#define SPECENUM_VALUE2NAME N_("?extraflag:TerrChangeRemoves") /* Extra will be built in cities automatically */ #define SPECENUM_VALUE3 EF_AUTO_ON_CITY_CENTER -#define SPECENUM_VALUE3NAME "AutoOnCityCenter" +#define SPECENUM_VALUE3NAME N_("?extraflag:AutoOnCityCenter") /* Extra is always present in cities */ #define SPECENUM_VALUE4 EF_ALWAYS_ON_CITY_CENTER -#define SPECENUM_VALUE4NAME "AlwaysOnCityCenter" +#define SPECENUM_VALUE4NAME N_("?extraflag:AlwaysOnCityCenter") /* Road style gfx from ocean extra connects to nearby land */ #define SPECENUM_VALUE5 EF_CONNECT_LAND -#define SPECENUM_VALUE5NAME "ConnectLand" +#define SPECENUM_VALUE5NAME N_("?extraflag:ConnectLand") /* Counts towards Global Warming */ #define SPECENUM_VALUE6 EF_GLOBAL_WARMING -#define SPECENUM_VALUE6NAME "GlobalWarming" +#define SPECENUM_VALUE6NAME N_("?extraflag:GlobalWarming") /* Counts towards Nuclear Winter */ #define SPECENUM_VALUE7 EF_NUCLEAR_WINTER -#define SPECENUM_VALUE7NAME "NuclearWinter" +#define SPECENUM_VALUE7NAME N_("?extraflag:NuclearWinter") /* Owner's flag will be shown on the tile */ #define SPECENUM_VALUE8 EF_SHOW_FLAG -#define SPECENUM_VALUE8NAME "ShowFlag" +#define SPECENUM_VALUE8NAME N_("?extraflag:ShowFlag") /* Extra's defense bonus will be counted to * separate "Natural" defense layer. */ #define SPECENUM_VALUE9 EF_NATURAL_DEFENSE -#define SPECENUM_VALUE9NAME "NaturalDefense" +#define SPECENUM_VALUE9NAME N_("?extraflag:NaturalDefense") #define SPECENUM_COUNT EF_COUNT #define SPECENUM_BITVECTOR bv_extra_flags #include "specenum_gen.h" Modified: trunk/common/requirements.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.c?rev=32236&r1=32235&r2=32236&view=diff ============================================================================== --- trunk/common/requirements.c (original) +++ trunk/common/requirements.c Sun Mar 13 01:42:56 2016 @@ -3507,8 +3507,7 @@ cat_snprintf(buf, bufsz, /* TRANS: Extra flag */ Q_("?extraflag:\"%s\" extra"), - /* flag names are never translated */ - extra_flag_id_name(psource->value.extraflag)); + extra_flag_id_translated_name(psource->value.extraflag)); return buf; case VUT_MINYEAR: cat_snprintf(buf, bufsz, _("After %s"), Modified: trunk/server/cityturn.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/cityturn.c?rev=32236&r1=32235&r2=32236&view=diff ============================================================================== --- trunk/server/cityturn.c (original) +++ trunk/server/cityturn.c Sun Mar 13 01:42:56 2016 @@ -1816,7 +1816,7 @@ "Postponing..."), city_link(pcity), city_improvement_name_translation(pcity, ptarget), - extra_flag_id_name(preq->source.value.extraflag)); + extra_flag_id_translated_name(preq->source.value.extraflag)); script_server_signal_emit("building_cant_be_built", 3, API_TYPE_BUILDING_TYPE, ptarget, API_TYPE_CITY, pcity, @@ -1829,7 +1829,7 @@ "Postponing..."), city_link(pcity), city_improvement_name_translation(pcity, ptarget), - extra_flag_id_name(preq->source.value.extraflag)); + extra_flag_id_translated_name(preq->source.value.extraflag)); script_server_signal_emit("building_cant_be_built", 3, API_TYPE_BUILDING_TYPE, ptarget, API_TYPE_CITY, pcity, Modified: trunk/translations/core/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/POTFILES.in?rev=32236&r1=32235&r2=32236&view=diff ============================================================================== --- trunk/translations/core/POTFILES.in (original) +++ trunk/translations/core/POTFILES.in Sun Mar 13 01:42:56 2016 @@ -194,6 +194,7 @@ common/connection.c common/effects.c common/events.c +common/extras.h common/fc_cmdhelp.c common/fc_types.h common/game.h _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits