Fix warnings reported by clang

[oweals/minetest.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index a42820a15d1a28473d4983da1c67d27277b937cb..3299f5b25a999ed5e7e7ced10eb7efe168ff0254 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,5 +1,27 @@
+/*
+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>
@@ -11,30 +33,64 @@
 #define gettext_noop(String) String
 #define N_(String) gettext_noop (String)
 
-inline void init_gettext(const char *path) {
-#if USE_GETTEXT
-       setlocale(LC_MESSAGES, "");
-       bindtextdomain(PROJECT_NAME, path);
-       textdomain(PROJECT_NAME);
+#if defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#ifndef _WIN32_WINNT
+       #define _WIN32_WINNT 0x0501
+#endif
+#include <windows.h>
+
+#endif // #if 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;
+#if defined(_WIN32)
+       int nResult = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, 0, 0 );
+       if( nResult == 0 )
+       {
+               errorstream<<"gettext: MultiByteToWideChar returned null"<<std::endl;
+       }
+       else
+       {
+               nstr = new wchar_t[nResult];
+               MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, (WCHAR *) nstr, nResult );
+       }
+#else
        size_t l = strlen(str)+1;
-       wchar_t* nstr = new wchar_t[l];
-       mbstowcs(nstr, str, l);
+       nstr = new wchar_t[l];
+
+       std::wstring intermediate = narrow_to_wide(str);
+       memset(nstr,0,l);
+       memcpy(nstr,intermediate.c_str(),l*sizeof(wchar_t));
+#endif
+
        return nstr;
 }
 
-inline void changeCtype(const char *l)
+/******************************************************************************/
+inline wchar_t* wgettext(const char *str)
 {
-       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 chartowchar_t(gettext(str));
 }
-#define GETTEXT_HEADER
+
+/******************************************************************************/
+inline std::wstring wstrgettext(std::string text) {
+       wchar_t* wlabel = wgettext(text.c_str());
+       std::wstring out = (std::wstring)wlabel;
+       delete[] wlabel;
+       return out;
+}
+
 #endif