[Freeciv-Dev] (PR#5092) [Fwd: [PATCH] Correct some messages in is_allowed_to_take]

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

-------- Original Message --------
Subject: [Freeciv-Dev] [PATCH] Correct some messages in is_allowed_to_take
Date: Thu, 14 Aug 2003 11:56:13 +0200
From: Erik Sigra <sigra@xxxxxxx>
Reply-To: sigra@xxxxxxx
To: freeciv-dev@xxxxxxxxxxx

The message that the function is_allowed_to_take will show does not 
depend on
which player is trying to take, it produces the same message for everyone.
Therefore it is misleading to tell the user "you can't ..." as if it was a
special rule for him. It should be something like "one  can't ...".


? is_allowed_to_take.diff
? remove_wrong_comment_from_stdinhand
? stdinhand.orig.c
? tinyisles-text.diff
? try_again.diff
? upgrade_unittype_plural_fix-1.diff
Index: stdinhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v
retrieving revision 1.288
diff -u -3 -p -r1.288 stdinhand.c
--- stdinhand.c 2003/08/10 14:44:14     1.288
+++ stdinhand.c 2003/08/14 09:48:13
@@ -3103,10 +3103,10 @@ static bool is_allowed_to_take(struct pl
   if (is_barbarian(pplayer)) {
     if (!(allow = strchr(game.allow_take, 'b'))) {
       if (will_obs) {
-        mystrlcpy(msg, _("Sorry, you can't observe barbarians in this game."),
+        mystrlcpy(msg, _("Sorry, one can't observe barbarians in this game."),
                   MAX_LEN_MSG);
       } else {
-        mystrlcpy(msg, _("Sorry, you can't take barbarians in this game."),
+        mystrlcpy(msg, _("Sorry, one can't take barbarians in this game."),
                   MAX_LEN_MSG);
       }
       return FALSE;
@@ -3114,10 +3114,10 @@ static bool is_allowed_to_take(struct pl
   } else if (!pplayer->is_alive) {
     if (!(allow = strchr(game.allow_take, 'd'))) {
       if (will_obs) {
-        mystrlcpy(msg, _("Sorry, you can't observe dead players in this 
game."),
+        mystrlcpy(msg, _("Sorry, one can't observe dead players in this 
game."),
                   MAX_LEN_MSG);
       } else {
-        mystrlcpy(msg, _("Sorry, you can't take dead players in this game."),
+        mystrlcpy(msg, _("Sorry, one can't take dead players in this game."),
                   MAX_LEN_MSG);
       }
       return FALSE;
@@ -3125,10 +3125,10 @@ static bool is_allowed_to_take(struct pl
   } else if (pplayer->ai.control) {
     if (!(allow = strchr(game.allow_take, (game.is_new_game ? 'A' : 'a')))) {
       if (will_obs) {
-        mystrlcpy(msg, _("Sorry, you can't observe AI players in this game."),
+        mystrlcpy(msg, _("Sorry, one can't observe AI players in this game."),
                   MAX_LEN_MSG);
       } else {
-        mystrlcpy(msg, _("Sorry, you can't take AI players in this game."),
+        mystrlcpy(msg, _("Sorry, one can't take AI players in this game."),
                   MAX_LEN_MSG);
       }
       return FALSE;
@@ -3137,10 +3137,10 @@ static bool is_allowed_to_take(struct pl
     if (!(allow = strchr(game.allow_take, (game.is_new_game ? 'H' : 'h')))) {
       if (will_obs) {
         mystrlcpy(msg, 
-                  _("Sorry, you can't observe human players in this game."),
+                  _("Sorry, one can't observe human players in this game."),
                   MAX_LEN_MSG);
       } else {
-        mystrlcpy(msg, _("Sorry, you can't take human players in this game."),
+        mystrlcpy(msg, _("Sorry, one can't take human players in this game."),
                   MAX_LEN_MSG);
       }
       return FALSE;
@@ -3150,18 +3150,18 @@ static bool is_allowed_to_take(struct pl
   allow++;
 
   if (will_obs && (*allow == '2' || *allow == '3')) {
-    mystrlcpy(msg, _("Sorry, you can't observe in this game."), MAX_LEN_MSG);
+    mystrlcpy(msg, _("Sorry, one can't observe in this game."), MAX_LEN_MSG);
     return FALSE;
   }
 
   if (!will_obs && *allow == '4') {
-    mystrlcpy(msg, _("Sorry, you can't take players in this game."),
+    mystrlcpy(msg, _("Sorry, one can't take players in this game."),
               MAX_LEN_MSG);
     return FALSE;
   }
 
   if (!will_obs && pplayer->is_connected && (*allow == '1' || *allow == '3')) {
-    mystrlcpy(msg, _("Sorry, you can't take players already connected "
+    mystrlcpy(msg, _("Sorry, one can't take players already connected "
                      "in this game."), MAX_LEN_MSG);
     return FALSE;
   }