X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgettext.h;h=885d7ca2da165691cf5e1c38a2394b175cd26d87;hb=91250c1078dc5dc5f48bba2b309920edd6cdfe68;hp=ff3a0f8cb7a5c52e8a7fe3565f5a0f6d6bd10059;hpb=831003156c77c811e7f1fcb65811d1d099587442;p=minetest.git

diff --git a/src/gettext.h b/src/gettext.h
index ff3a0f8cb..885d7ca2d 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,43 +1,62 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #ifndef GETTEXT_HEADER
+#define GETTEXT_HEADER
+
 #include "config.h" // for USE_GETTEXT
 
 #if USE_GETTEXT
-#include <libintl.h>
+	#include <libintl.h>
 #else
-#define gettext(String) String
+	// In certain environments, some standard headers like <iomanip>
+	// and <locale> include libintl.h. If libintl.h is included after
+	// we define our gettext macro below, this causes a syntax error
+	// at the declaration of the gettext function in libintl.h.
+	// Fix this by including such a header before defining the macro.
+	// See issue #4446.
+	// Note that we can't include libintl.h directly since we're in
+	// the USE_GETTEXT=0 case and can't assume that gettext is installed.
+	#include <locale>
+
+	#define gettext(String) String
 #endif
 
 #define _(String) gettext(String)
-#define gettext_noop(String) String
-#define N_(String) gettext_noop (String)
+#define gettext_noop(String) (String)
+#define N_(String) gettext_noop((String))
 
-inline void init_gettext(const char *path) {
-#if USE_GETTEXT
-	// don't do this if MSVC compiler is used, it gives an assertion fail
-	#ifndef _MSC_VER
-		setlocale(LC_MESSAGES, "");
-	#endif
-	bindtextdomain(PROJECT_NAME, path);
-	textdomain(PROJECT_NAME);
-#endif
-}
+void init_gettext(const char *path, const std::string &configured_language,
+	int argc, char *argv[]);
 
-inline wchar_t* chartowchar_t(const char *str)
+extern wchar_t *utf8_to_wide_c(const char *str);
+
+// You must free the returned string!
+// The returned string is allocated using new
+inline const wchar_t *wgettext(const char *str)
 {
-	size_t l = strlen(str)+1;
-	wchar_t* nstr = new wchar_t[l];
-	mbstowcs(nstr, str, l);
-	return nstr;
+	return utf8_to_wide_c(gettext(str));
 }
 
-inline void changeCtype(const char *l)
+inline std::string strgettext(const std::string &text)
 {
-	char *ret = NULL;
-	ret = setlocale(LC_CTYPE, l);
-	if(ret == NULL)
-		std::cout<<"locale could not be set"<<std::endl;
-	else
-		std::cout<<"locale has been set to:"<<ret<<std::endl;
+	return gettext(text.c_str());
 }
-#define GETTEXT_HEADER
+
 #endif