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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/10/23 12:51:28

Modified files:
        src            : unit.cpp 

Log message:
        Remove obsolete code and fix traits translation.

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

Patches:
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.99 wesnoth/src/unit.cpp:1.100
--- wesnoth/src/unit.cpp:1.99   Sat Oct  2 15:53:58 2004
+++ wesnoth/src/unit.cpp        Sat Oct 23 12:51:22 2004
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.99 2004/10/02 15:53:58 Sirp Exp $ */
+/* $Id: unit.cpp,v 1.100 2004/10/23 12:51:22 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -166,12 +166,7 @@
                for(std::set<int>::const_iterator itor = chosen_traits.begin();
                    itor != chosen_traits.end(); ++itor) {
                        const std::string& trait_name = 
(*traits[*itor])["name"];
-                       const std::string& lang_trait = 
string_table["trait_"+trait_name];
-                       if(lang_trait.empty() == false)
-                               traitsDescription_ += lang_trait;
-                       else
-                               traitsDescription_ += trait_name;
-
+                       traitsDescription_ += gettext(trait_name.c_str());
                        traitsDescription_ += ",";
                }