replace the per language addendum with a global addendum and

[apt.git] / apt-pkg / deb / debrecords.cc

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 8ed0bb7eb2febee4323a8218992ac3145512725d..5b8538a4676676ec1c950bece01578809d7b29af 100644 (file)
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -11,6 +11,7 @@
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>

+#include <apt-pkg/aptconfiguration.h>

 #include <langinfo.h>
                                                                        /*}}}*/
 
 #include <langinfo.h>
                                                                        /*}}}*/
 


@@ -109,13 +110,18 @@ string debRecordParser::ShortDesc()
 string debRecordParser::LongDesc()
 {
   string orig, dest;
 string debRecordParser::LongDesc()
 {
   string orig, dest;

-  char *codeset = nl_langinfo(CODESET);

 
   if (!Section.FindS("Description").empty())
      orig = Section.FindS("Description").c_str();
 
   if (!Section.FindS("Description").empty())
      orig = Section.FindS("Description").c_str();

-  else 
-     orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str();
+  else
+  {
+     vector<string> const lang = APT::Configuration::getLanguages();
+     for (vector<string>::const_iterator l = lang.begin();
+         orig.empty() && l != lang.end(); l++)
+       orig = Section.FindS(string("Description-").append(*l).c_str());
+  }

 
 

+  char const * const codeset = nl_langinfo(CODESET);

   if (strcmp(codeset,"UTF-8") != 0) {
      UTF8ToCodeset(codeset, orig, &dest);
      orig = dest;
   if (strcmp(codeset,"UTF-8") != 0) {
      UTF8ToCodeset(codeset, orig, &dest);
      orig = dest;