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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/10/31 14:28:32

Modified files:
        src            : actions.cpp 

Log message:
        Fix untranslatability in the damage-computation-thingy dialog box.

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

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.161 wesnoth/src/actions.cpp:1.162
--- wesnoth/src/actions.cpp:1.161       Sat Oct 30 11:29:30 2004
+++ wesnoth/src/actions.cpp     Sun Oct 31 14:28:31 2004
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.161 2004/10/30 11:29:30 silene Exp $ */
+/* $Id: actions.cpp,v 1.162 2004/10/31 14:28:31 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -330,7 +330,8 @@
                if(include_strings && resist != 0) {
                        std::stringstream str_resist;
 
-                       str_resist << gettext(resist < 0 ? N_("attacker 
resistance vs") : N_("attacker vulnerability vs")) << " " << 
string_table[defend.type()]
+                       str_resist << gettext(resist < 0 ? N_("attacker 
resistance vs") : N_("attacker vulnerability vs"))
+                               << " " << gettext(defend.type().c_str())
                                << ", ,^" << (resist > 0 ? "+" : "") << resist 
<< "%";
                        res.defend_calculations.push_back(str_resist.str());
                }
@@ -448,8 +449,9 @@
        if(include_strings && resist != 0) {
                std::stringstream str_resist;
 
-               str_resist << gettext(resist < 0 ? N_("defender resistance vs") 
: N_("defender vulnerability vs")) << " " << string_table[attack.type()]
-                              << ", ,^" << (resist > 0 ? "+" : "") << resist 
<< "%";
+               str_resist << gettext(resist < 0 ? N_("defender resistance vs") 
: N_("defender vulnerability vs"))
+                       << " " << gettext(attack.type().c_str())
+                       << ", ,^" << (resist > 0 ? "+" : "") << resist << "%";
                res.attack_calculations.push_back(str_resist.str());
        }