Complete.Org: Mailing Lists: Archives: freeciv-dev: July 2004:
[Freeciv-Dev] Re: (PR#9565) Latest patch that shows AI attitude needs i1
Home

[Freeciv-Dev] Re: (PR#9565) Latest patch that shows AI attitude needs i1

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] Re: (PR#9565) Latest patch that shows AI attitude needs i18n
From: "Mateusz Stefek" <mstefek@xxxxxxxxx>
Date: Sat, 31 Jul 2004 04:20:19 -0700
Reply-to: rt@xxxxxxxxxxx

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

> I used Q_() instead of _() because "peacefull" and "friendly" are  
> also
> 
> used in other places.
>
I forgot qualifier in front of "Harmony"
and there was a bug which caused assertion to trigger if love = -51.
--
mateusz




----------------------------------------------------------------------
Laczysz sie przez modem? Mamy dla Ciebie bonusy!
>>> http://link.interia.pl/f1826

Index: player.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/player.c,v
retrieving revision 1.143
diff -u -r1.143 player.c
--- player.c    30 Jul 2004 20:40:49 -0000      1.143
+++ player.c    31 Jul 2004 11:17:09 -0000
@@ -586,29 +586,29 @@
 **************************************************************************/
 const char *love_text(const int love)
 {
-  if (love < -51) {
-    return "Bloodfeud";
+  if (love <= -51) {
+    return Q_("?attitude:Bloodfeud");
   } else if (love >= -50 && love <= -21) {
-    return "Loathing";
+    return Q_("?attitude:Loathing");
   } else if (love >= -20 && love <= -11) {
-    return "Hatred";
+    return Q_("?attitude:Hatred");
   } else if (love >= -10 && love <= -5) {
-    return "Dislike";
+    return Q_("?attitude:Dislike");
   } else if (love >= -4 && love <= -3) {
-    return "Unease";
+    return Q_("?attitude:Unease");
   } else if (love >= -2 && love <= 2) {
-    return "Indifferent";
+    return Q_("?attitude:Indifferent");
   } else if (love >= 3 && love <= 9) {
-    return "Peaceful";
+    return Q_("?attitude:Peaceful");
   } else if (love >= 10 && love <= 20) {
-    return "Relaxed";
+    return Q_("?attitude:Relaxed");
   } else if (love >= 21 && love <= 50) {
-    return "Friendly";
+    return Q_("?attitude:Friendly");
   } else if (love >= 51 && love <= 70) {
-    return "Amiable";
+    return Q_("?attitude:Amiable");
   } else {
     assert(love >= 71);
-    return "Harmony";
+    return Q_("?attitude:Harmony");
   }
 }
 



[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] Re: (PR#9565) Latest patch that shows AI attitude needs i18n, Mateusz Stefek <=