* apt-pkg/indexfile.cc:

  - If no "_" is found in the language code, try to find a "."
    This is required for languages like Esperanto that have no
    county associated with them (LP: #560956)
    Thanks to "Aisano" for the fix

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 34fd71b20197473ec4fefba739dea80263598a68..5a82b7b2e601b7802b291a9a5f5e7032ed8af94b 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -127,6 +127,8 @@ string pkgIndexFile::LanguageCode()
      
      if(lang.find("_") != lang.npos)
        return lang.substr(0, lang.find("_"));
+     else if(lang.find(".") != lang.npos)
+       return lang.substr(0, lang.find("."));
      else
        return lang;
   }

diff --git a/debian/changelog b/debian/changelog
index 5211fc649349c910e4472cc71843757975cd04e6..7c0024160af6309882e58a449711988a1a5f2481 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,11 @@ apt (0.7.25.4) UNRELEASED; urgency=low
       the right cache control headers
   * apt-pkg/depcache.cc:
     - fix incorrect std::cout usage for debug output
+  * apt-pkg/indexfile.cc:
+    - If no "_" is found in the language code, try to find a "."
+      This is required for languages like Esperanto that have no
+      county associated with them (LP: #560956)
+      Thanks to "Aisano" for the fix
 
   [ Robert Collins ]
   * Change the package index Info methods to allow apt-cache policy to be