Call setlocale in all methods, don't call bindtextdomain in http

diff --git a/debian/changelog b/debian/changelog
index 28279ebf4832930d30a894b496c11fc06e2381c2..3ac4cbaee9a7678e37b1cd90b8b2a23a8dc9f687 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 apt (0.5.32) unstable; urgency=low
 
 apt (0.5.32) unstable; urgency=low
 

-  * Call setlocale and bindtextdomain in the http method, so that the
-    messages are properly localised (Closes: #282700)
+  * Call setlocale in the http methods, so that the messages are properly
+    localised (Closes: #282700)

 
  --
 
 
  --
 

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 17872de2929b5457690f7468a0d735cb5c2ace74..0d8fdc29c67e6f78997ae04bf8b6dcd715b83894 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -187,6 +187,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

    CDROMMethod Mth;
    return Mth.Run();
 }
    CDROMMethod Mth;
    return Mth.Run();
 }

diff --git a/methods/copy.cc b/methods/copy.cc
index 4cbfa35324676ab6b632e3c4485d0d51f95f13d1..3f367e72a6bdb98b7a77dea101f8f4f9b5abaf9e 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -86,6 +86,8 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

    CopyMethod Mth;
    return Mth.Run();
 }
    CopyMethod Mth;
    return Mth.Run();
 }

diff --git a/methods/file.cc b/methods/file.cc
index 9fc5764d624407863c78ce22068d18d76837fc81..76fd64d861ac2174cb16d3e182a5fb7fad2ad5d4 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -83,6 +83,8 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

    FileMethod Mth;
    return Mth.Run();
 }
    FileMethod Mth;
    return Mth.Run();
 }

diff --git a/methods/ftp.cc b/methods/ftp.cc
index cf2838e3f8a002c71c6310822d068fd510a68238..0f222272d5fcaf6973cc5599436ae1b5b4f1b964 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1083,6 +1083,8 @@ bool FtpMethod::Fetch(FetchItem *Itm)
 
 int main(int argc,const char *argv[])
 { 
 
 int main(int argc,const char *argv[])
 { 

+   setlocale(LC_ALL, "");
+

    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)
    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)

diff --git a/methods/gzip.cc b/methods/gzip.cc
index af1ac465ef88ed380bd4a2a6afd50248d9239b0b..ac64f33f87324f55dcd595c875ada3e1b177e36d 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -154,6 +154,8 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

+   setlocale(LC_ALL, "");
+

    GzipMethod Mth;
 
    Prog = strrchr(argv[0],'/');
    GzipMethod Mth;
 
    Prog = strrchr(argv[0],'/');

diff --git a/methods/http.cc b/methods/http.cc
index e53667c07c2949c54d621c326b337ecedad7b875..f9358990cd88dd87fec4f9fc4aa290c3cd5b1646 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1184,7 +1184,6 @@ int HttpMethod::Loop()
 int main()
 {
    setlocale(LC_ALL, "");
 int main()
 {
    setlocale(LC_ALL, "");

-   bindtextdomain(APT_DOMAIN, _config->FindDir("Dir::Locale").c_str());

 
    HttpMethod Mth;
    
 
    HttpMethod Mth;
    

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 2292e72e40958ba825234a315420ad259e20a1c2..c742a6eafd654faf3b250d89a710bf6e621c6958 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -511,6 +511,8 @@ bool RSHMethod::Fetch(FetchItem *Itm)
 
 int main(int argc, const char *argv[])
 {
 
 int main(int argc, const char *argv[])
 {

+   setlocale(LC_ALL, "");
+

    RSHMethod Mth;
    Prog = strrchr(argv[0],'/');
    Prog++;
    RSHMethod Mth;
    Prog = strrchr(argv[0],'/');
    Prog++;