X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgettext.h;h=8235efa8ac0b3ef7f998d7dd364860610810060c;hb=da34a2b33e1f600ec11172f599384b9a92835403;hp=54470cb0d863fc03ea25f04e2c5e9ca3bfd82649;hpb=f1d9880006cf713597c1fc573f83db75062712c9;p=oweals%2Fminetest.git

diff --git a/src/gettext.h b/src/gettext.h
index 54470cb0d..8235efa8a 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,49 +1,64 @@
+/*
+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
-#include "log.h"
 
 #if USE_GETTEXT
-#include <libintl.h>
+	#include <libintl.h>
 #else
-#define gettext(String) String
+	#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);
+#ifdef _MSC_VER
+void init_gettext(const char *path, const std::string &configured_language,
+		int argc, char** argv);
+#else
+void init_gettext(const char *path, const std::string &configured_language);
 #endif
-}
 
-inline wchar_t* chartowchar_t(const char *str)
+extern wchar_t *narrow_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 narrow_to_wide_c(gettext(str));
 }
 
-inline wchar_t* wgettext(const char *str)
+inline std::wstring wstrgettext(const std::string &text)
 {
-	return chartowchar_t(gettext(str));
+	const wchar_t *tmp = wgettext(text.c_str());
+	std::wstring retval = (std::wstring)tmp;
+	delete[] tmp;
+	return retval;
 }
 
-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)
-		infostream<<"locale could not be set"<<std::endl;
-	else
-		infostream<<"locale has been set to:"<<ret<<std::endl;
+	return gettext(text.c_str());
 }
-#define GETTEXT_HEADER
+
 #endif