51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef GETTEXT_HEADER
-#define GETTEXT_HEADER
+#pragma once
#include "config.h" // for USE_GETTEXT
-#include "log.h"
+#include <string>
#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))
-#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#ifndef _WIN32_WINNT
- #define _WIN32_WINNT 0x0501
-#endif
-#include <windows.h>
-
-#endif // #if defined(_WIN32)
+void init_gettext(const char *path, const std::string &configured_language,
+ int argc, char *argv[]);
-#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 wchar_t *utf8_to_wide_c(const char *str);
-extern std::wstring narrow_to_wide(const std::string& mbs);
-#include "util/numeric.h"
-
-
-/******************************************************************************/
-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 )
- {
- 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;
- 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;
+ // We must check here that is not an empty string to avoid trying to translate it
+ return str[0] ? utf8_to_wide_c(gettext(str)) : utf8_to_wide_c("");
}
-/******************************************************************************/
-inline wchar_t* wgettext(const char *str)
+inline std::string strgettext(const std::string &text)
{
- return chartowchar_t(gettext(str));
+ return text.empty() ? "" : gettext(text.c_str());
}
-
-/******************************************************************************/
-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