#if USE_GETTEXT
#include <libintl.h>
#else
+ // 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 gettext_noop(String) (String)
#define N_(String) gettext_noop((String))
-#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
+ int argc, char *argv[]);
-extern wchar_t *narrow_to_wide_c(const char *str);
+extern wchar_t *utf8_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)
{
- return narrow_to_wide_c(gettext(str));
-}
-
-inline std::wstring wstrgettext(const std::string &text)
-{
- const wchar_t *tmp = wgettext(text.c_str());
- std::wstring retval = (std::wstring)tmp;
- delete[] tmp;
- return retval;
+ return utf8_to_wide_c(gettext(str));
}
inline std::string strgettext(const std::string &text)