[Freeciv-Dev] (PR#7438) bug in mapview popup with ceasefire

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

If you middle-click on the city of a nation you have a ceasefire with, 
the popup text is wrong.

This patch fixes it.

jason

Index: client/mapctrl_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/mapctrl_common.c,v
retrieving revision 1.27
diff -u -r1.27 mapctrl_common.c
--- client/mapctrl_common.c     2004/02/18 15:33:16     1.27
+++ client/mapctrl_common.c     2004/02/18 15:36:59
@@ -751,11 +751,12 @@
       if (ds[owner->player_no].type == DS_CEASEFIRE) {
        int turns = ds[owner->player_no].turns_left;
 
+       /* TRANS: City: Warsaw (Polish, 5 turn ceasefire)" */
         add_line(out, sizeof(out), PL_("City: %s (%s, %d turn ceasefire)",
                                       "City: %s (%s, %d turn ceasefire)",
                                       turns),
+                pcity->name,
                 get_nation_name(owner->nation),
-                diplo_city_adjectives[ds[owner->player_no].type],
                 turns);
       } else {
         /* TRANS: "City: <name> (<nation>,<diplomatic_state>)" */