X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fmain.c;h=fc41153b2a862e774f37250e32721aff7dae538b;hp=8002c1be2a0303e08702fab8f4556665f4de5169;hb=2baf3239333fd28763ce4135c38d6e85dcbb8cfc;hpb=13fec855660ee55c43f64fe47fbc284f35ca6e6e diff --git a/src/main.c b/src/main.c index 8002c1be..fc41153b 100644 --- a/src/main.c +++ b/src/main.c @@ -57,6 +57,7 @@ as that of the covered work. */ #include "convert.h" #include "spider.h" #include "http.h" /* for save_cookies */ +#include "iri.h" #include #include @@ -1067,17 +1068,11 @@ for details.\n\n")); if (opt.enable_iri) { if (!opt.locale) - { - opt.locale = getenv ("CHARSET"); + opt.locale = find_locale (); - if (opt.locale == NULL) - opt.locale = nl_langinfo(CODESET); - } - else - { - /* sXXXav : check given locale */ - logprintf (LOG_VERBOSE, "Check the locale...\n"); - } + /* sXXXav : check given locale and remote encoding */ + + logprintf (LOG_VERBOSE, "Locale = %s\n", quote (opt.locale)); } #else if (opt.enable_iri || opt.locale || opt.encoding_remote)