[Freeciv-Dev] (PR#10101) PL at cityturn.c:945

["Mateusz Stefek" <mstefek@xxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10101 >

We need to use ngettext.
--
mateusz

? civgame-3700.sav.gz
? civgame-3950.sav.gz
Index: cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.261
diff -u -r1.261 cityturn.c
--- cityturn.c  14 Sep 2004 03:29:22 -0000      1.261
+++ cityturn.c  14 Sep 2004 12:37:43 -0000
@@ -942,8 +942,11 @@
     if ((mod = get_current_construction_bonus(pcity, EFT_GIVE_IMM_TECH))) {
       int i;
 
-      notify_player(pplayer, _("Game: %s boosts research, "
-                              "you gain %d immediate advances."),
+      notify_player(pplayer, PL_("Game: %s boosts research, "
+                                "you gain %d immediate advance.",
+                                "Game: %s boosts research, "
+                                "you gain %d immediate advances.",
+                                mod),
                    improvement_types[pcity->currently_building].name, mod);
 
       for (i = 0; i < mod; i++) {
Index: stdinhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v
retrieving revision 1.347
diff -u -r1.347 stdinhand.c
--- stdinhand.c 10 Sep 2004 21:20:53 -0000      1.347
+++ stdinhand.c 14 Sep 2004 12:37:50 -0000
@@ -1614,13 +1614,7 @@
     packet.id = s++;
     sz_strlcpy(packet.name, settings[i].name);
     sz_strlcpy(packet.short_help, settings[i].short_help);
-
-    /* append extra help */
-    sz_strlcpy(packet.extra_help, settings[i].name);
-    if (settings[i].extra_help[0] != '\0') {
-      sz_strlcat(packet.extra_help, "\n\n");
-      sz_strlcat(packet.extra_help, settings[i].extra_help);
-    }
+    sz_strlcpy(packet.extra_help, settings[i].extra_help);
 
     packet.category = settings[i].category;
     packet.type = settings[i].type;