From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat, 23 Jul 2011 14:38:37 +0000 (+0200)
Subject: Refactor gettext init
X-Git-Tag: 0.2.20110922~81^2~34^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c578efb32b57b08275b9a0a2fd4a76b4e4b9e87d;p=oweals%2Fminetest.git

Refactor gettext init

Put the gettext init code in a macro and define it appropriately
depending on whether gettext is actually available or not.
---

diff --git a/src/gettext.h b/src/gettext.h
index e74b4eb96..751b83774 100644
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -1,21 +1,21 @@
-#ifdef GETTEXT_FOUND
-#ifdef USE_GETTEXT
+#if defined(GETTEXT_FOUND) && defined(USE_GETTEXT)
 #include <libintl.h>
 #else
 #define gettext(String) String
-#define bindtextdomain(domain, dir) /* */
-#define textdomain(domain) /* */
-#endif
-#else
-#define gettext(String) String
-#define bindtextdomain(domain, dir) /* */
-#define textdomain(domain) /* */
 #endif
 
 #define _(String) gettext(String)
 #define gettext_noop(String) String
 #define N_(String) gettext_noop (String)
 
+inline void init_gettext(const char *path) {
+#if USE_GETTEXT
+	setlocale(LC_MESSAGES, "");
+	bindtextdomain(PROJECT_NAME, path);
+	textdomain(PROJECT_NAME);
+#endif
+}
+
 inline wchar_t* chartowchar_t(const char *str)
 {
 	size_t l = strlen(str)+1;
diff --git a/src/main.cpp b/src/main.cpp
index 2f48d229f..bdfbc35f7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1132,11 +1132,7 @@ int main(int argc, char *argv[])
 	// Create user data directory
 	fs::CreateDir(porting::path_userdata);
 
-#ifdef LC_MESSAGES
-	setlocale(LC_MESSAGES, "");
-	bindtextdomain(PROJECT_NAME, (porting::path_userdata+"/locale").c_str());
-	textdomain(PROJECT_NAME);
-#endif
+	init_gettext((porting::path_userdata+"/locale").c_str());
 
 	// Initialize debug streams
 #ifdef RUN_IN_PLACE