diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | methods/cdrom.cc | 2 | ||||
| -rw-r--r-- | methods/copy.cc | 2 | ||||
| -rw-r--r-- | methods/file.cc | 2 | ||||
| -rw-r--r-- | methods/ftp.cc | 2 | ||||
| -rw-r--r-- | methods/gzip.cc | 2 | ||||
| -rw-r--r-- | methods/http.cc | 1 | ||||
| -rw-r--r-- | methods/rsh.cc | 2 |
8 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 28279ebf4..3ac4cbaee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ 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 17872de29..0d8fdc29c 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -187,6 +187,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm) int main() { + setlocale(LC_ALL, ""); + CDROMMethod Mth; return Mth.Run(); } diff --git a/methods/copy.cc b/methods/copy.cc index 4cbfa3532..3f367e72a 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -86,6 +86,8 @@ bool CopyMethod::Fetch(FetchItem *Itm) int main() { + setlocale(LC_ALL, ""); + CopyMethod Mth; return Mth.Run(); } diff --git a/methods/file.cc b/methods/file.cc index 9fc5764d6..76fd64d86 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -83,6 +83,8 @@ bool FileMethod::Fetch(FetchItem *Itm) int main() { + setlocale(LC_ALL, ""); + FileMethod Mth; return Mth.Run(); } diff --git a/methods/ftp.cc b/methods/ftp.cc index cf2838e3f..0f222272d 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1083,6 +1083,8 @@ bool FtpMethod::Fetch(FetchItem *Itm) 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) diff --git a/methods/gzip.cc b/methods/gzip.cc index af1ac465e..ac64f33f8 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -154,6 +154,8 @@ bool GzipMethod::Fetch(FetchItem *Itm) int main(int argc, char *argv[]) { + setlocale(LC_ALL, ""); + GzipMethod Mth; Prog = strrchr(argv[0],'/'); diff --git a/methods/http.cc b/methods/http.cc index e53667c07..f9358990c 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1184,7 +1184,6 @@ int HttpMethod::Loop() int main() { setlocale(LC_ALL, ""); - bindtextdomain(APT_DOMAIN, _config->FindDir("Dir::Locale").c_str()); HttpMethod Mth; diff --git a/methods/rsh.cc b/methods/rsh.cc index 2292e72e4..c742a6eaf 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -511,6 +511,8 @@ bool RSHMethod::Fetch(FetchItem *Itm) int main(int argc, const char *argv[]) { + setlocale(LC_ALL, ""); + RSHMethod Mth; Prog = strrchr(argv[0],'/'); Prog++; |