Complete.Org: Mailing Lists: Archives: freeciv-dev: February 2006:
[Freeciv-Dev] (PR#15690) i18n: server/diplhand armistice turns don't use
Home

[Freeciv-Dev] (PR#15690) i18n: server/diplhand armistice turns don't use

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: evyscr@xxxxxxxxx
Subject: [Freeciv-Dev] (PR#15690) i18n: server/diplhand armistice turns don't use PL_()
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 27 Feb 2006 19:25:46 -0800
Reply-to: bugs@xxxxxxxxxxx

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

> [evyscr - Mon Feb 27 21:07:08 2006]:
> 
> Good daytime!
> 
> #: server/diplhand.c:460 server/diplhand.c:464 
> #, c-format 
> msgid "" 
> "You agree on an armistice with %s. In %d turns it will turn into a
peace " 
> "treaty. Move your units out of %s's territory."

Indeed; even though the number of turns is currently a constant 16, in
some languages 16 versus 15 might have a different pluralization for
"turns"!

-jason

Index: server/diplhand.c
===================================================================
--- server/diplhand.c   (revision 11658)
+++ server/diplhand.c   (working copy)
@@ -447,13 +447,23 @@
        pdest->diplstates[pgiver->player_no].max_state = 
           MAX(DS_PEACE, pdest->diplstates[pgiver->player_no].max_state);
        notify_player(pgiver, NULL, E_TREATY_PEACE,
-                        _("You agree on an armistice with %s. In %d turns it 
will turn "
-         "into a peace treaty. Move your units out of %s's territory."),
-                        pdest->name, TURNS_LEFT, pdest->name);
+                     PL_("You agree on an armistice with %s. In %d turn "
+                         "it will turn into a peace treaty. Move your "
+                         "units out of %s's territory.",
+                         "You agree on an armistice with %s. In %d turns "
+                         "it will turn into a peace treaty. Move your "
+                         "units out of %s's territory.",
+                         TURNS_LEFT),
+                     pdest->name, TURNS_LEFT, pdest->name);
        notify_player(pdest, NULL, E_TREATY_PEACE,
-                        _("You agree on an armistice with %s. In %d turns it 
will turn "
-         "into a peace treaty. Move your units out of %s's territory."),
-                        pgiver->name, TURNS_LEFT, pgiver->name);
+                     PL_("You agree on an armistice with %s. In %d turn "
+                         "it will turn into a peace treaty. Move your "
+                         "units out of %s's territory.",
+                         "You agree on an armistice with %s. In %d turns "
+                         "it will turn into a peace treaty. Move your "
+                         "units out of %s's territory.",
+                         TURNS_LEFT),
+                     pgiver->name, TURNS_LEFT, pgiver->name);
        if (old_diplstate == DS_ALLIANCE) {
          update_players_after_alliance_breakup(pgiver, pdest);
        }

[Prev in Thread] Current Thread [Next in Thread]