From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 3 May 2010 08:07:13 +0000 (+0200)
Subject: * apt-pkg/indexfile.cc:
X-Git-Tag: 0.8.0~15^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/8f40076991ecc89ab1e3c486da2696a44c285f18?hp=--cc

* 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
---

8f40076991ecc89ab1e3c486da2696a44c285f18
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 34fd71b20..5a82b7b2e 100644
--- 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 5211fc649..7c0024160 100644
--- 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