[Freeciv-Dev] Re: (PR#15376) i18n: ai/advdiplomacy.c messages like "We declare war in %d turns" should use PL_()

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

Per I. Mathisen wrote:
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=15376 >
> 
> On Thu, 2 Feb 2006, Egor Vyscrebentsov wrote:
> 
>>ai/advdiplomacy.c:war_countdown() contains several messages which include
>>"in %d turns" construction. Now they all use _() macro. IMNSHO PL_()
>>macro should be used for such constructions.
> 
> 
> Well, there is only one case where turns can be not plural, and that
> should in any case probably be fixed like this
> 
> Index: ai/advdiplomacy.c
> ===================================================================
> --- ai/advdiplomacy.c   (revision 11581)
> +++ ai/advdiplomacy.c   (working copy)
> @@ -1253,7 +1253,7 @@
>          && pplayer->diplstates[aplayer->player_no].has_reason_to_cancel >= 2
>          && ai->diplomacy.player_intel[aplayer->player_no].countdown == -1) {
>        DIPLO_LOG(LOG_DIPL2, pplayer, aplayer, "Plans war in revenge");
> -      war_countdown(pplayer, aplayer, map.size, WAR_REASON_BEHAVIOUR);
> +      war_countdown(pplayer, aplayer, MIN(map.size, 2), 
> WAR_REASON_BEHAVIOUR);
>      }
>    } players_iterate_end;
> 
> so that the AI will always spend one turn for preparations.

Values other than 1 still need the PL_ construction in Polish and Russian.

-jason