* 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 9b85a8cf83422dfdcdcfd005614bc8e048947dc2..2f5bc24390c66cc954078b4bf453ac45ecb981e6 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -126,6 +126,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 7ff516fc2b1517686e6a63dd9daf7871ea9edd6d..a8d0cda46414a9b7c3a0e4687639618368ac9e85 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ apt (0.7.25.3ubuntu8) lucid-proposedUNRELEASED; urgency=low
   [ Michael Vogt ]
   * apt-pkg/deb/debrecords.cc:
     - fix max tag buffer size (LP: #545336, closes: #578959)
+  * 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
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 05 May 2010 09:57:53 +0200