diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-08-19 19:56:58 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-08-19 19:56:58 +0000 |
| commit | 7db5af1eda421c8a603038336f70971d4170a63e (patch) | |
| tree | df59b50a4766855ec060f0c9fc36a943e0579746 | |
| parent | c117ec6d1fdf6e0831e7b74edeacf5013da35353 (diff) | |
| download | navit-7db5af1eda421c8a603038336f70971d4170a63e.tar.gz | |
Fix:core:Fix warning for undeclared use of textdomain.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5580 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | navit/main.c | 13 | ||||
| -rw-r--r-- | navit/navit_nls.c | 18 | ||||
| -rw-r--r-- | navit/navit_nls.h | 1 | ||||
| -rw-r--r-- | navit/start_real.c | 2 |
4 files changed, 20 insertions, 14 deletions
diff --git a/navit/main.c b/navit/main.c index efb1a714a..231b70f80 100644 --- a/navit/main.c +++ b/navit/main.c @@ -412,16 +412,3 @@ main_init(const char *program) } } -void -main_init_nls(void) -{ -#ifdef USE_NATIVE_LANGUAGE_SUPPORT -#ifdef FORCE_LOCALE -#define STRINGIFY2(x) #x -#define STRINGIFY(x) STRINGIFY2(x) - setlocale(LC_MESSAGES,STRINGIFY(FORCE_LOCALE)); -#endif - navit_nls_add_textdomain(PACKAGE, getenv("NAVIT_LOCALEDIR")); - textdomain(PACKAGE); -#endif -} diff --git a/navit/navit_nls.c b/navit/navit_nls.c index 496850ad3..622f88a1d 100644 --- a/navit/navit_nls.c +++ b/navit/navit_nls.c @@ -1,6 +1,10 @@ #include "config.h" #include "debug.h" #include <glib.h> +#include <stdlib.h> +#ifdef HAVE_API_WIN32_CE +#include "libc.h" +#endif #ifdef USE_LIBGNUINTL #include <libgnuintl.h> @@ -73,3 +77,17 @@ navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long in return msgid_plural; } } + +void +navit_nls_main_init(void) +{ +#ifdef USE_NATIVE_LANGUAGE_SUPPORT +#ifdef FORCE_LOCALE +#define STRINGIFY2(x) #x +#define STRINGIFY(x) STRINGIFY2(x) + setlocale(LC_MESSAGES,STRINGIFY(FORCE_LOCALE)); +#endif + navit_nls_add_textdomain(PACKAGE, getenv("NAVIT_LOCALEDIR")); + textdomain(PACKAGE); +#endif +} diff --git a/navit/navit_nls.h b/navit/navit_nls.h index fbb86a174..3f9c6947d 100644 --- a/navit/navit_nls.h +++ b/navit/navit_nls.h @@ -4,6 +4,7 @@ char *navit_nls_add_textdomain(const char *package, const char *dir); char *navit_nls_remove_textdomain(const char *package); const char *navit_nls_gettext(const char *msgid); const char *navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n); +void navit_nls_main_init(void); #define _(STRING) navit_nls_gettext(STRING) #define gettext_noop(String) String diff --git a/navit/start_real.c b/navit/start_real.c index 956625a4f..67478a075 100644 --- a/navit/start_real.c +++ b/navit/start_real.c @@ -90,7 +90,7 @@ int main_real(int argc, char * const* argv) #endif atom_init(); main_init(argv[0]); - main_init_nls(); + navit_nls_main_init(); debug_init(argv[0]); cp = getenv("NAVIT_LOGFILE"); |