diff --git a/ChangeLog b/ChangeLog index 4cfd9232..8c310c02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-11 Giuseppe Scrivano + + * util/trunc.c (main): Ensure bindtextdomain is called. + 2014-06-10 Giuseppe Scrivano * build-aux/build_info.pl: Remove trailing whitespaces. diff --git a/src/ChangeLog b/src/ChangeLog index dbe10283..91abc52d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2014-06-11 Giuseppe Scrivano + + * decc_ver.c (main): Ensure bindtextdomain is called. + * hash.c (main): Likewise. + * html-parse.c: Likewise. + * netrc.c: Likewise. + * test.c: Likewise. + * trunc.c: Likewise. + 2014-06-10 Giuseppe Scrivano * wget.h: Remove trailing whitespaces. diff --git a/src/decc_ver.c b/src/decc_ver.c index 8d9e5142..6eb7a9d0 100644 --- a/src/decc_ver.c +++ b/src/decc_ver.c @@ -2,6 +2,15 @@ int main( void) { + +#ifdef ENABLE_NLS + /* Set the current locale. */ + setlocale (LC_ALL, ""); + /* Set the text message domain. */ + bindtextdomain ("wget", LOCALEDIR); + textdomain ("wget"); +#endif /* ENABLE_NLS */ + #ifdef __VMS_VERSION printf( " __VMS_VERSION: >%s<.\n", __VMS_VERSION); #else /* def __VMS_VERSION */ diff --git a/src/hash.c b/src/hash.c index 129ead1a..af8e583f 100644 --- a/src/hash.c +++ b/src/hash.c @@ -767,6 +767,15 @@ main (void) { struct hash_table *ht = make_string_hash_table (0); char line[80]; + +#ifdef ENABLE_NLS + /* Set the current locale. */ + setlocale (LC_ALL, ""); + /* Set the text message domain. */ + bindtextdomain ("wget", LOCALEDIR); + textdomain ("wget"); +#endif /* ENABLE_NLS */ + while ((fgets (line, sizeof (line), stdin))) { int len = strlen (line); diff --git a/src/html-parse.c b/src/html-parse.c index 20791cd8..f9418c70 100644 --- a/src/html-parse.c +++ b/src/html-parse.c @@ -1189,6 +1189,14 @@ int main () int read_count; int tag_counter = 0; +#ifdef ENABLE_NLS + /* Set the current locale. */ + setlocale (LC_ALL, ""); + /* Set the text message domain. */ + bindtextdomain ("wget", LOCALEDIR); + textdomain ("wget"); +#endif /* ENABLE_NLS */ + while ((read_count = fread (x + length, 1, size - length, stdin))) { length += read_count; diff --git a/src/netrc.c b/src/netrc.c index 5fc34ccf..bad574d0 100644 --- a/src/netrc.c +++ b/src/netrc.c @@ -455,6 +455,14 @@ main (int argc, char **argv) file = argv[1]; target = argv[2]; +#ifdef ENABLE_NLS + /* Set the current locale. */ + setlocale (LC_ALL, ""); + /* Set the text message domain. */ + bindtextdomain ("wget", LOCALEDIR); + textdomain ("wget"); +#endif /* ENABLE_NLS */ + if (stat (file, &sb)) { fprintf (stderr, _("%s: cannot stat %s: %s\n"), argv[0], file, diff --git a/src/test.c b/src/test.c index 68c4863b..c8351ca2 100644 --- a/src/test.c +++ b/src/test.c @@ -75,6 +75,14 @@ main (int argc _GL_UNUSED, char *argv[]) { const char *result; +#ifdef ENABLE_NLS + /* Set the current locale. */ + setlocale (LC_ALL, ""); + /* Set the text message domain. */ + bindtextdomain ("wget", LOCALEDIR); + textdomain ("wget"); +#endif /* ENABLE_NLS */ + program_name = argv[0]; result = all_tests(); diff --git a/util/trunc.c b/util/trunc.c index a5f1dcb0..94285077 100644 --- a/util/trunc.c +++ b/util/trunc.c @@ -76,6 +76,14 @@ main (int argc, char *argv[]) int option; int fd; +#ifdef ENABLE_NLS + /* Set the current locale. */ + setlocale (LC_ALL, ""); + /* Set the text message domain. */ + bindtextdomain ("wget", LOCALEDIR); + textdomain ("wget"); +#endif /* ENABLE_NLS */ + /* Parse options. */ while ((option = getopt (argc, argv, "c")) != -1) {