Clean up gettext initialization

[minetest.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index ca82b1f02d8b728163732e2a9192af812ca1ac2b..0170d1c456c621797f984e2e870a7f7b74843a27 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,87 +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))
 
-#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#ifndef _WIN32_WINNT
-       #define _WIN32_WINNT 0x0501
-#endif
-#include <windows.h>
+#ifdef _MSC_VER
+void init_gettext(const char *path, const std::string &configured_language,
+               int argc, const char *argv[]);
+#else
+void init_gettext(const char *path, const std::string &configured_language);
 #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
+extern wchar_t *utf8_to_wide_c(const char *str);
 
-       // 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)
-#endif
-}
-
-inline wchar_t* chartowchar_t(const char *str)
+// You must free the returned string!
+// The returned string is allocated using new
+inline const wchar_t *wgettext(const char *str)
 {
-       wchar_t* nstr = 0;
-#if defined(_WIN32)
-       int nResult = MultiByteToWideChar( CP_UTF8, 0, (LPCSTR) str, -1, 0, 0 );
-       if( nResult == 0 )
-       {
-               fprintf( stderr, "error: MultiByteToWideChar returned null\n" );
-       }
-       else
-       {
-               nstr = new wchar_t[nResult];
-               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);
-#endif
-
-       return nstr;
+       return utf8_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