* apt-pkg/indexfile.cc:

  - fix problem overwriting APT::Acquire::Translation
* doc/examples/configure-index:
  - document APT::Acquire::Translation

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index bb2210bf677cebcaf64516fa86bd0ce1b9d1c62c..fad38772b606c58a53763f803eb524b695c1b61b 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -75,7 +75,7 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
 /* */
 bool pkgIndexFile::TranslationsAvailable()
 {
 /* */
 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());
   
   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()
 {
 /* 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) 
   {
 
   if (Translation.compare("environment") == 0) 
   {

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 0be0aee9848dae7a2233aa8ac2ac4a2cfd618396..f58855792b3fc3006905a82315187cf639dbf08d 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -106,9 +106,6 @@ bool pkgInitConfig(Configuration &Cnf)
    }
 #endif
 
    }
 #endif
 

-   // Translation
-   Cnf.Set("APT::Acquire::Translation", "environment");
-   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

diff --git a/debian/changelog b/debian/changelog
index cbcee29198a82972e7aab39723132b2b5e0619a1..aa6a01692a89e252e372aee15a5ddebb496cb8cb 100644 (file)
--- 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)
     - 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 4262b479f1589a7c50b339641b37d196ea638365..e5d1f2ab30704d891ce09876a944f60f1ac5da91 100644 (file)
--- 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"; 
   };
    // mirror failure reporting url
    ReportFailures "http://example.com/mirror-failure"; 
   };

+
+  // translations can be set here to "none", "environment" or "$locale"
+  Translation "none";

 };
 
 // Directory layout
 };
 
 // Directory layout

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 794b346c0b6a56f9bc6053835efee4d58dd7742b..82dfae54895fdcd2e6cf372db22b69f137d15ac2 100644 (file)
--- 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 ""
 
 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 ""
 
 #, 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 ""
 
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""