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

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/04/13 19:46:35

Modified files:
        src            : gettext.hpp 
        src/serialization: string_utils.cpp 

Log message:
        cleanup of the vgettext move (should fix problems reported on macosx); 
made vgettext obey the same rules as _() for changing the textdomain of a 
source file

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/gettext.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/string_utils.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: wesnoth/src/gettext.hpp
diff -u wesnoth/src/gettext.hpp:1.8 wesnoth/src/gettext.hpp:1.9
--- wesnoth/src/gettext.hpp:1.8 Tue Apr 12 22:03:41 2005
+++ wesnoth/src/gettext.hpp     Wed Apr 13 19:46:32 2005
@@ -4,7 +4,6 @@
 // gettext-related declarations
 
 #include <libintl.h>
-#include <string>
 
 const char* egettext(const char*);
 const char* sgettext(const char*);
Index: wesnoth/src/serialization/string_utils.cpp
diff -u wesnoth/src/serialization/string_utils.cpp:1.17 
wesnoth/src/serialization/string_utils.cpp:1.18
--- wesnoth/src/serialization/string_utils.cpp:1.17     Tue Apr 12 22:03:42 2005
+++ wesnoth/src/serialization/string_utils.cpp  Wed Apr 13 19:46:35 2005
@@ -1,4 +1,4 @@
-/* $Id: string_utils.cpp,v 1.17 2005/04/12 22:03:42 ydirson Exp $ */
+/* $Id: string_utils.cpp,v 1.18 2005/04/13 19:46:35 ydirson Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -19,6 +19,7 @@
 #include <sstream>
 
 #include "serialization/string_utils.hpp"
+#include "gettext.hpp"
 #include "util.hpp"
 #include "log.hpp"
 #include "string_utils.hpp"
@@ -557,7 +558,7 @@
 
 std::string vgettext (const char *msgid, const utils::string_map& symbols)
 {
-       const std::string orig(gettext(msgid));
+       const std::string orig(_(msgid));
        const std::string msg = utils::interpolate_variables_into_string(orig, 
&symbols);
        return msg;
 }