X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgettext.h;h=81510aed6578ccf58813787dd0fa5ff087c7da2d;hb=dec8c43de3afdbd2e257a031f5e053e7f1e74aa0;hp=fd32e082f7e960c052ba06a716922ce4ee0cf779;hpb=be4670fecfceabd6760153e9a5b4f9868614e573;p=oweals%2Fminetest.git

diff --git a/src/gettext.h b/src/gettext.h
index fd32e082f..81510aed6 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,4 +1,25 @@
+/*
+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"
 
@@ -18,34 +39,20 @@
 	#define _WIN32_WINNT 0x0501
 #endif
 #include <windows.h>
-#endif
 
-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);
-#if defined(_WIN32)
-	// As linux is successfully switched to UTF-8 completely at about year 2005
-	// Windows still uses obsolete codepage based locales because you
-	// cannot recompile closed-source applications
+#endif // #if defined(_WIN32)
 
-	// Set character encoding for Win32
-	char *tdomain = textdomain( (char *) NULL );
-	if( tdomain == NULL )
-	{
-		fprintf( stderr, "warning: domainname parameter is the null pointer, default domain is not set\n" );
-		tdomain = (char *) "messages";
-	}
-	/*char *codeset = */bind_textdomain_codeset( tdomain, "UTF-8" );
-	//fprintf( stdout, "%s: debug: domainname = %s; codeset = %s\n", argv[0], tdomain, codeset );
-#endif // defined(_WIN32)
+#ifdef _MSC_VER
+void init_gettext(const char *path,std::string configured_language,int argc, char** argv);
+#else
+void init_gettext(const char *path,std::string configured_language);
 #endif
-}
 
+extern std::wstring narrow_to_wide(const std::string& mbs);
+#include "util/numeric.h"
+
+
+/******************************************************************************/
 inline wchar_t* chartowchar_t(const char *str)
 {
 	wchar_t* nstr = 0;
@@ -53,7 +60,7 @@ inline wchar_t* chartowchar_t(const char *str)
 	int nResult = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, 0, 0 );
 	if( nResult == 0 )
 	{
-		fprintf( stderr, "error: MultiByteToWideChar returned null\n" );
+		errorstream<<"gettext: MultiByteToWideChar returned null"<<std::endl;
 	}
 	else
 	{
@@ -61,34 +68,29 @@ inline wchar_t* chartowchar_t(const char *str)
 		MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, (WCHAR *) nstr, nResult );
 	}
 #else
-	size_t l = strlen(str)+1;
-	nstr = new wchar_t[l];
-	mbstowcs(nstr, str, l);
+	size_t l = strlen(str);
+	nstr = new wchar_t[l+1];
+
+	std::wstring intermediate = narrow_to_wide(str);
+	memset(nstr, 0, (l+1)*sizeof(wchar_t));
+	memcpy(nstr, intermediate.c_str(), l*sizeof(wchar_t));
 #endif
 
 	return nstr;
 }
 
+/******************************************************************************/
 inline wchar_t* wgettext(const char *str)
 {
 	return chartowchar_t(gettext(str));
 }
 
-inline void changeCtype(const char *l)
-{
-	/*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;*/
-}
-
+/******************************************************************************/
 inline std::wstring wstrgettext(std::string text) {
 	wchar_t* wlabel = wgettext(text.c_str());
 	std::wstring out = (std::wstring)wlabel;
 	delete[] wlabel;
 	return out;
 }
-#define GETTEXT_HEADER
+
 #endif