[Wesnoth-cvs-commits] wesnoth/src gettext.hpp gettext.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/10/30 16:33:49

Modified files:
        src            : gettext.hpp gettext.cpp 

Log message:
        fixed bug in vgettext

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gettext.hpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gettext.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: wesnoth/src/gettext.cpp
diff -u wesnoth/src/gettext.cpp:1.4 wesnoth/src/gettext.cpp:1.5
--- wesnoth/src/gettext.cpp:1.4 Thu Sep  2 15:19:01 2004
+++ wesnoth/src/gettext.cpp     Sat Oct 30 16:33:48 2004
@@ -28,10 +28,10 @@
        return msgval;
 }
 
-const char* vgettext (const char *msgid, const string_map& symbols)
+std::string vgettext (const char *msgid, const string_map& symbols)
 {
        const std::string orig(gettext(msgid));
        const std::string msg = config::interpolate_variables_into_string(orig,
                        &symbols);
-       return msg.c_str();
+       return msg;
 }
Index: wesnoth/src/gettext.hpp
diff -u wesnoth/src/gettext.hpp:1.3 wesnoth/src/gettext.hpp:1.4
--- wesnoth/src/gettext.hpp:1.3 Thu Sep  2 15:19:01 2004
+++ wesnoth/src/gettext.hpp     Sat Oct 30 16:33:48 2004
@@ -7,7 +7,7 @@
 #include <libintl.h>
 const char* sgettext (const char*);
 const char* dsgettext (const char * domainname, const char *msgid);
-const char* vgettext (const char*,const string_map&);
+std::string vgettext (const char*,const string_map&);
 
 #ifdef GETTEXT_DOMAIN
 # define _(String) dgettext(GETTEXT_DOMAIN,String)