[Wesnoth-cvs-commits] wesnoth/src multiplayer_connect.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/06/05 11:15:30

Modified files:
        src            : multiplayer_connect.cpp 

Log message:
        Fix bug #13263: client screen slot names are in host language.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.148&tr2=1.149&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.148 
wesnoth/src/multiplayer_connect.cpp:1.149
--- wesnoth/src/multiplayer_connect.cpp:1.148   Sat Jun  4 19:16:05 2005
+++ wesnoth/src/multiplayer_connect.cpp Sun Jun  5 11:15:30 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.148 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.149 2005/06/05 11:15:30 silene Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -292,28 +292,31 @@
        res["description"] = id_;
 
        if (id_.empty()) {
+               char const *description;
                switch(controller_) {
                case CNTR_NETWORK:
-                       res["user_description"] = _("(Vacant slot)");
+                       description = N_("(Vacant slot)");
                        break;
                case CNTR_LOCAL:
                        if(enabled_ && cfg_["save_id"].empty()) {
                                res["save_id"] = "local" + res["side"].str();
                        }
-                       res["user_description"] =  _("Anonymous local player");
+                       description = N_("Anonymous local player");
                        break;
                case CNTR_COMPUTER:
                        if(enabled_ && cfg_["save_id"].empty()) {
                                res["save_id"] = "ai" + res["side"].str();
                        }
-                       res["user_description"] = _("Computer player");
+                       description = N_("Computer player");
                        break;
                case CNTR_EMPTY:
-                       res["user_description"] = _("(Empty slot)");
+                       description = N_("(Empty slot)");
                        break;
                default:
+                       wassert(false);
                        break;
                }
+               res["user_description"] = t_string(description, "wesnoth");
        } else {
                if(enabled_ && cfg_["save_id"].empty()) {
                        res["save_id"] = id_;