diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-23 16:38:37 +0200 |
|---|---|---|
| committer | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-07-24 16:52:59 +0200 |
| commit | c578efb32b57b08275b9a0a2fd4a76b4e4b9e87d (patch) | |
| tree | 6159b66d34e5294c715eaf53f9431dfbd9295d1e | |
| parent | 5aa2679be7696862066edf617dc5a8261b7325ab (diff) | |
| download | minetest-c578efb32b57b08275b9a0a2fd4a76b4e4b9e87d.tar.gz minetest-c578efb32b57b08275b9a0a2fd4a76b4e4b9e87d.tar.bz2 minetest-c578efb32b57b08275b9a0a2fd4a76b4e4b9e87d.zip | |
Refactor gettext init
Put the gettext init code in a macro and define it appropriately
depending on whether gettext is actually available or not.
| -rw-r--r-- | src/gettext.h | 18 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
2 files changed, 10 insertions, 14 deletions
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
|