Author: cazfi
Date: Fri Jun 17 17:43:14 2016
New Revision: 32885

URL: http://svn.gna.org/viewcvs/freeciv?rev=32885&view=rev
Log:
Improvements to translatable strings.

Patch by Konstantin Vedeneev <konved> and myself

See patch #6908

Modified:
    trunk/server/cityhand.c
    trunk/server/cityturn.c

Modified: trunk/server/cityhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityhand.c?rev=32885&r1=32884&r2=32885&view=diff
==============================================================================
--- trunk/server/cityhand.c     (original)
+++ trunk/server/cityhand.c     Fri Jun 17 17:43:14 2016
@@ -369,13 +369,13 @@
   if (VUT_UTYPE == pcity->production.kind) {
     notify_player(pplayer, pcity->tile, E_UNIT_BUY, ftc_server,
                   /* TRANS: bought an unit. */
-                  _("You bought %s in %s."),
+                  Q_("?unit:You bought %s in %s."),
                   utype_name_translation(pcity->production.value.utype),
                   city_name_get(pcity));
   } else if (VUT_IMPROVEMENT == pcity->production.kind) {
     notify_player(pplayer, pcity->tile, E_IMP_BUY, ftc_server,
                   /* TRANS: bought an improvement .*/
-                  _("You bought %s in %s."),
+                  Q_("?improvement:You bought %s in %s."),
                   
improvement_name_translation(pcity->production.value.building),
                   city_name_get(pcity));
   }

Modified: trunk/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityturn.c?rev=32885&r1=32884&r2=32885&view=diff
==============================================================================
--- trunk/server/cityturn.c     (original)
+++ trunk/server/cityturn.c     Fri Jun 17 17:43:14 2016
@@ -234,12 +234,17 @@
   city_built_iterate(pcity, pimprove) {
     if (improvement_obsolete(pplayer, pimprove, pcity)
      && can_city_sell_building(pcity, pimprove)) {
+      int sgold;
+
       do_sell_building(pplayer, pcity, pimprove);
+      sgold = impr_sell_gold(pimprove);
       notify_player(pplayer, city_tile(pcity), E_IMP_SOLD, ftc_server,
-                    _("%s is selling %s (obsolete) for %d."),
+                    PL_("%s is selling %s (obsolete) for %d.",
+                        "%s is selling %s (obsolete) for %d.",
+                        sgold),
                     city_link(pcity),
-                    improvement_name_translation(pimprove), 
-                    impr_sell_gold(pimprove));
+                    improvement_name_translation(pimprove),
+                    sgold);
       sold = TRUE;
     }
   } city_built_iterate_end;


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

Reply via email to