Browse Source

* apt-pkg/aptconfiguration.cc:

- respect the none-force even in LANG=C (Closes: #602573)
debian/1.8.y
David Kalnischkies 12 years ago
parent
commit
037454791f
  1. 3
      apt-pkg/aptconfiguration.cc
  2. 7
      debian/changelog
  3. 6
      test/libapt/getlanguages_test.cc

3
apt-pkg/aptconfiguration.cc

@ -168,7 +168,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
// first cornercase: LANG=C, so we use only "en" Translation
if (envLong == "C") {
codes.push_back("en");
if (_config->Find("Acquire::Languages","") != "none")
codes.push_back("en");
allCodes = codes;
allCodes.insert(allCodes.end(), builtin.begin(), builtin.end());
if (All == true)

7
debian/changelog

@ -1,10 +1,15 @@
apt (0.8.9) UNRELEASED; urgency=low
[ Christian Perrier ]
* Fix "typos" in French manpages translations. Thanks to
Cyril Brulebois for bashing me.
* Drop useless untranslatable sections from apt.8
-- Christian Perrier <bubulle@debian.org> Sat, 30 Oct 2010 09:51:18 +0200
[ David Kalnischkies ]
* apt-pkg/aptconfiguration.cc:
- respect the none-force even in LANG=C (Closes: #602573)
-- David Kalnischkies <kalnischkies@gmail.com> Sat, 06 Nov 2010 12:50:20 +0100
apt (0.8.8) unstable; urgency=low

6
test/libapt/getlanguages_test.cc

@ -85,6 +85,12 @@ int main(int argc,char *argv[])
equals(vec.size(), 1);
equals(vec[0], "en");
_config->Set("Acquire::Languages", "none");
env[0] = "C";
vec = APT::Configuration::getLanguages(false, false, env);
equals(vec.size(), 0);
_config->Set("Acquire::Languages", "");
_config->Set("Acquire::Languages::1", "environment");
_config->Set("Acquire::Languages::2", "en");
env[0] = "de_DE.UTF-8";

Loading…
Cancel
Save