summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2004-09-30 23:37:11 +0200
committerWerner Koch <wk@gnupg.org>2004-09-30 23:37:11 +0200
commit048635bedefb5c3244cc5a28b38ab4daafb3cf78 (patch)
treea40758da990bec5beb1ac74bc7cf3bdde0b8dc65 /g10
parentPreparing a new release. Updated gettext (diff)
downloadgnupg2-048635bedefb5c3244cc5a28b38ab4daafb3cf78.tar.xz
gnupg2-048635bedefb5c3244cc5a28b38ab4daafb3cf78.zip
* gpgv.c (i18n_init): Always use LC_ALL.
* kbxutil.c (i18n_init): Always use LC_ALL. * gpgsm.c (i18n_init): Always use LC_ALL. * certdump.c (gpgsm_format_name): Factored code out to .. (gpgsm_format_name2): .. new. (gpgsm_print_name): Factored code out to .. (gpgsm_print_name2): .. new. (print_dn_part): New arg TRANSLATE. Changed all callers. (print_dn_parts): Ditto. (gpgsm_format_keydesc): Do not translate the SUBJECT; we require it to stay UTF-8 but we still want to filter out bad control characters. * gpgconf.c (i18n_init): Always use LC_ALL.
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog2
-rw-r--r--g10/gpgv.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 187d8584b..36d5e3314 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,7 @@
2004-09-30 Werner Koch <wk@g10code.com>
+ * gpgv.c (i18n_init): Always use LC_ALL.
+
* Makefile.am (LDADD): Adjusted for gettext 0.14.
2004-09-20 Werner Koch <wk@g10code.com>
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 9bd954c6f..015736c33 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -119,12 +119,7 @@ i18n_init(void)
set_gettext_file( PACKAGE_GT );
#else
#ifdef ENABLE_NLS
-#ifdef HAVE_LC_MESSAGES
- setlocale( LC_TIME, "" );
- setlocale( LC_MESSAGES, "" );
-#else
- setlocale( LC_ALL, "" );
-#endif
+ setlocale( LC_ALL, "" );
bindtextdomain( PACKAGE_GT, LOCALEDIR );
textdomain( PACKAGE_GT );
#endif