[Freeciv-Dev] (PR#13901) more bad grammar

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=13901 >

This patch fixes the comma splices and adds a separate message for the
0-gold case.

It's possible we need to use PL_ here however?

-jason

Index: server/citytools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v
retrieving revision 1.347
diff -p -u -r1.347 citytools.c
--- server/citytools.c  5 Sep 2005 15:55:46 -0000       1.347
+++ server/citytools.c  7 Sep 2005 16:58:03 -0000
@@ -1242,26 +1242,38 @@ void handle_unit_enter_city(struct unit 
   cplayer->economic.gold -= coins;
   send_player_info(cplayer, cplayer);
   if (pcity->original != pplayer) {
-    notify_player(pplayer, pcity->tile, E_UNIT_WIN_ATT, 
-                    _("You conquer %s, your lootings accumulate"
-                      " to %d gold!"), 
-                    pcity->name, coins);
-    notify_player(cplayer, pcity->tile, E_CITY_LOST, 
-                    _("%s conquered %s and looted %d gold"
-                      " from the city."),
-                    pplayer->name, pcity->name, coins);
+    if (coins > 0) {
+      notify_player(pplayer, pcity->tile, E_UNIT_WIN_ATT, 
+                   _("You conquer %s; your lootings accumulate"
+                     " to %d gold!"), 
+                   pcity->name, coins);
+      notify_player(cplayer, pcity->tile, E_CITY_LOST, 
+                   _("%s conquered %s and looted %d gold"
+                     " from the city."),
+                   pplayer->name, pcity->name, coins);
+    } else {
+      notify_player(pplayer, pcity->tile, E_UNIT_WIN_ATT, 
+                   _("You conquer %s"), pcity->name);
+      notify_player(cplayer, pcity->tile, E_CITY_LOST, 
+                   _("%s conquered %s."), pplayer->name, pcity->name);
+    }
     gamelog(GAMELOG_LOSECITY, city_owner(pcity), pplayer, pcity, "conquered");
   } else {
-    notify_player(pplayer, pcity->tile, E_UNIT_WIN_ATT, 
-                    _("You have liberated %s!"
-                      " Lootings accumulate to %d gold."),
-                    pcity->name, coins);
-    
-    notify_player(cplayer, pcity->tile, E_CITY_LOST, 
-                    _("%s liberated %s and looted %d gold"
-                      " from the city."),
-                    pplayer->name, pcity->name, coins);
-
+    if (coins > 0) {
+      notify_player(pplayer, pcity->tile, E_UNIT_WIN_ATT, 
+                   _("You have liberated %s!"
+                     " Lootings accumulate to %d gold."),
+                   pcity->name, coins);
+      notify_player(cplayer, pcity->tile, E_CITY_LOST, 
+                   _("%s liberated %s and looted %d gold"
+                     " from the city."),
+                   pplayer->name, pcity->name, coins);
+    } else {
+      notify_player(pplayer, pcity->tile, E_UNIT_WIN_ATT, 
+                   _("You have liberated %s!"), pcity->name);
+      notify_player(cplayer, pcity->tile, E_CITY_LOST, 
+                   _("%s liberated %s."), pplayer->name, pcity->name);
+    }
     gamelog(GAMELOG_LOSECITY, city_owner(pcity), pplayer, pcity, "liberated");
   }
 
Index: server/techtools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/techtools.c,v
retrieving revision 1.23
diff -p -u -r1.23 techtools.c
--- server/techtools.c  5 Sep 2005 04:21:55 -0000       1.23
+++ server/techtools.c  7 Sep 2005 16:58:03 -0000
@@ -357,8 +357,8 @@ void found_new_tech(struct player *plr, 
 
     if (choose_goal_tech(plr)) {
       notify_team(plr, NULL, E_TECH_LEARNED,
-                      _("Learned %s.  "
-                        "Our scientists focus on %s, goal is %s."),
+                      _("Learned %s. "
+                        "Our scientists focus on %s; goal is %s."),
                       get_tech_name(plr, tech_found),
                       get_tech_name(plr, research->researching),
                       get_tech_name(plr, research->tech_goal));