Improve lighting of entities.

[dragonfireclient.git] / src / gettext.h

diff --git a/src/gettext.h b/src/gettext.h
index 862274a31d20542a2b88241d28a36f3b9f399721..6225fef93e359a12b5e037c9d5f0c66e4b1a33e8 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -17,73 +17,91 @@ 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 "log.h"
+#include <string>
+#include "porting.h"
 
 #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)
-
-#if defined(_WIN32)
-#define WIN32_LEAN_AND_MEAN
-#ifndef _WIN32_WINNT
-       #define _WIN32_WINNT 0x0501
-#endif
-#include <windows.h>
+#define gettext_noop(String) (String)
+#define N_(String) gettext_noop((String))
 
-#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);
 
-/******************************************************************************/
-inline wchar_t* chartowchar_t(const char *str)
+// The returned string must be freed using delete[]
+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;
+       // 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;
+/**
+ * Returns translated string with format args applied
+ *
+ * @tparam Args Template parameter for format args
+ * @param src Translation source string
+ * @param args Variable format args
+ * @return translated string
+ */
+template <typename ...Args>
+inline std::wstring fwgettext(const char *src, Args&&... args)
+{
+       wchar_t buf[255];
+       const wchar_t* str = wgettext(src);
+       swprintf(buf, sizeof(buf) / sizeof(wchar_t), str, std::forward<Args>(args)...);
+       delete[] str;
+       return std::wstring(buf);
 }
 
-#endif
+/**
+ * Returns translated string with format args applied
+ *
+ * @tparam Args Template parameter for format args
+ * @param format Translation source string
+ * @param args Variable format args
+ * @return translated string.
+ */
+template <typename ...Args>
+inline std::string fmtgettext(const char *format, Args&&... args)
+{
+       std::string buf;
+       std::size_t buf_size = 256;
+       buf.resize(buf_size);
+
+       format = gettext(format);
+
+       int len = porting::mt_snprintf(&buf[0], buf_size, format, std::forward<Args>(args)...);
+       if (len <= 0) throw std::runtime_error("gettext format error: " + std::string(format));
+       if ((size_t)len >= buf.size()) {
+               buf.resize(len+1); // extra null byte
+               porting::mt_snprintf(&buf[0], buf.size(), format, std::forward<Args>(args)...);
+       }
+       buf.resize(len); // remove null bytes
+
+       return buf;
+}