Add mod.conf to preview clientmod (#11020)

[dragonfireclient.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index 8e6282887632e81e0a9534ec6d6f699823b78aad..42b375d869c2b6f1d246b5a09532aa1b3f79c496 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -17,45 +17,45 @@ 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
+#pragma once
 
 #include "config.h" // for USE_GETTEXT
+#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))
 
-#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
-
-extern const wchar_t *narrow_to_wide_c(const char *mbs);
-extern std::wstring narrow_to_wide(const std::string &mbs);
+void init_gettext(const char *path, const std::string &configured_language,
+       int argc, char *argv[]);
 
+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)
-{
-       return narrow_to_wide(gettext(text.c_str()));
+       // 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 std::string strgettext(const std::string &text)
 {
-       return gettext(text.c_str());
+       return text.empty() ? "" : gettext(text.c_str());
 }
-
-#endif