diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/gpg-error.c | 4 | ||||
| -rw-r--r-- | src/init.c | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2006-05-29 Marcus Brinkmann <[email protected]> + + * src/init.c (gpg_err_init) [!ENABLE_NLS]: Do not initialize the + locale. + * src/gpg-error.c (i18n_init) [!ENABLE_NLS]: Likewise. + Patch submitted by Nils Durner <[email protected]>. + 2006-05-25 Marcus Brinkmann <[email protected]> * lang/cl/gpg-error.asd: Renamed to ... diff --git a/src/gpg-error.c b/src/gpg-error.c index 8197356..806bd54 100644 --- a/src/gpg-error.c +++ b/src/gpg-error.c @@ -64,16 +64,15 @@ static void drop_locale_dir (char *locale_dir); static void i18n_init (void) { +#ifdef ENABLE_NLS char *locale_dir; -#ifdef ENABLE_NLS # ifdef HAVE_LC_MESSAGES setlocale (LC_TIME, ""); setlocale (LC_MESSAGES, ""); # else setlocale (LC_ALL, "" ); # endif -#endif locale_dir = get_locale_dir (); if (locale_dir) @@ -82,6 +81,7 @@ i18n_init (void) drop_locale_dir (locale_dir); } textdomain (PACKAGE); +#endif } @@ -48,6 +48,7 @@ static void drop_locale_dir (char *locale_dir); gpg_error_t gpg_err_init (void) { +#ifdef ENABLE_NLS char *locale_dir; /* We only have to bind our locale directory to our text domain. */ @@ -58,6 +59,7 @@ gpg_err_init (void) bindtextdomain (PACKAGE, locale_dir); drop_locale_dir (locale_dir); } +#endif return 0; } |