diff options
| author | Marcus Brinkmann <[email protected]> | 2005-10-23 20:01:04 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2005-10-23 20:01:04 +0000 |
| commit | b969dc048b6a1c801d176f70aa93941491c32bd2 (patch) | |
| tree | 5a6be768dae4241a5c832bea12460ed3ae17860b /src/gpg-error.c | |
| parent | 2005-10-20 Marcus Brinkmann <[email protected]> (diff) | |
| download | libgpg-error-b969dc048b6a1c801d176f70aa93941491c32bd2.tar.gz libgpg-error-b969dc048b6a1c801d176f70aa93941491c32bd2.zip | |
2005-10-23 Marcus Brinkmann <[email protected]>
* src/Makefile.am (libgpg_error_la_SOURCES): Add init.c.
* src/init.c: New file.
* src/gpg-error.h.in (gpg_error_init): New function.
* src/gpg-error.def: Add gpg_err_init.
* src/gpg-error.c: Remove SIMPLE_GETTEXT stuff.
(i18n_init): Don't bind text domain.
(main): Call gpg_err_init.
Diffstat (limited to 'src/gpg-error.c')
| -rw-r--r-- | src/gpg-error.c | 53 |
1 files changed, 23 insertions, 30 deletions
diff --git a/src/gpg-error.c b/src/gpg-error.c index 566d66e..3693b0b 100644 --- a/src/gpg-error.c +++ b/src/gpg-error.c @@ -29,28 +29,21 @@ #include <limits.h> #include <stdio.h> -#ifdef USE_SIMPLE_GETTEXT - int set_gettext_file( const char *filename ); - const char *gettext( const char *msgid ); +#ifdef HAVE_LOCALE_H +# include <locale.h> +#endif +#ifdef ENABLE_NLS +# include <libintl.h> # define _(a) gettext (a) -# define N_(a) (a) -#else -# ifdef HAVE_LOCALE_H -# include <locale.h> -# endif -# ifdef ENABLE_NLS -# include <libintl.h> -# define _(a) gettext (a) -# ifdef gettext_noop -# define N_(a) gettext_noop (a) -# else -# define N_(a) (a) -# endif +# ifdef gettext_noop +# define N_(a) gettext_noop (a) # else -# define _(a) (a) # define N_(a) (a) # endif -#endif /*!USE_SIMPLE_GETTEXT*/ +#else +# define _(a) (a) +# define N_(a) (a) +#endif #include <gpg-error.h> @@ -249,22 +242,21 @@ get_err_from_str (char *str, gpg_error_t *err) static void -i18n_init(void) +i18n_init (void) { -#ifdef USE_SIMPLE_GETTEXT - set_gettext_file (PACKAGE); -#else -# ifdef ENABLE_NLS -# ifdef HAVE_LC_MESSAGES +#ifdef ENABLE_NLS +# ifdef HAVE_LC_MESSAGES setlocale (LC_TIME, ""); setlocale (LC_MESSAGES, ""); -# else +# else setlocale (LC_ALL, "" ); -# endif - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); # endif #endif + + /* We have the same text domain as the library. Thus, we don't need + to bind our text domain to our locale directory (this is done by + gpg_err_init). We just need to set our text domain. */ + textdomain (PACKAGE); } @@ -273,8 +265,9 @@ main (int argc, char *argv[]) { int i = 1; - /* Setup I18N. */ - i18n_init(); + gpg_err_init (); + + i18n_init (); if (argc == 1) { |