summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/indexfile.cc4
-rw-r--r--apt-pkg/init.cc3
-rw-r--r--debian/changelog4
-rw-r--r--doc/examples/configure-index3
-rw-r--r--po/apt-all.pot4
5 files changed, 11 insertions, 7 deletions
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index bb2210bf6..fad38772b 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -75,7 +75,7 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
/* */
bool pkgIndexFile::TranslationsAvailable()
{
- const string Translation = _config->Find("APT::Acquire::Translation");
+ const string Translation = _config->Find("APT::Acquire::Translation", "environment");
if (Translation.compare("none") != 0)
return CheckLanguageCode(LanguageCode().c_str());
@@ -107,7 +107,7 @@ bool pkgIndexFile::CheckLanguageCode(const char *Lang)
/* return the language code */
string pkgIndexFile::LanguageCode()
{
- const string Translation = _config->Find("APT::Acquire::Translation");
+ const string Translation = _config->Find("APT::Acquire::Translation", "environment");
if (Translation.compare("environment") == 0)
{
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 0be0aee98..f58855792 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -106,9 +106,6 @@ bool pkgInitConfig(Configuration &Cnf)
}
#endif
- // Translation
- Cnf.Set("APT::Acquire::Translation", "environment");
-
return true;
}
/*}}}*/
diff --git a/debian/changelog b/debian/changelog
index cbcee2919..aa6a01692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ apt (0.6.46.4ubuntu9) feisty; urgency=low
- fix version output in autoremove list (LP#68941)
* apt-pkg/packagemanager.cc:
- do not spin 100% cpu in FixMissing() (LP#84476)
+ * apt-pkg/indexfile.cc:
+ - fix problem overwriting APT::Acquire::Translation
+ * doc/examples/configure-index:
+ - document APT::Acquire::Translation
--
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 4262b479f..e5d1f2ab3 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -191,6 +191,9 @@ Acquire
// mirror failure reporting url
ReportFailures "http://example.com/mirror-failure";
};
+
+ // translations can be set here to "none", "environment" or "$locale"
+ Translation "none";
};
// Directory layout
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 794b346c0..82dfae548 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -2294,12 +2294,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:126
+#: apt-pkg/init.cc:123
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:142
+#: apt-pkg/init.cc:139
msgid "Unable to determine a suitable packaging system type"
msgstr ""