diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-05-03 10:07:13 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-05-03 10:07:13 +0200 |
| commit | 8f40076991ecc89ab1e3c486da2696a44c285f18 (patch) | |
| tree | a2cac5fcb379c0fcfc8862b0e655902121fa0978 | |
| parent | 4dec007b1d8af31824903ffa3099ff4839ab528e (diff) | |
* 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
| -rw-r--r-- | apt-pkg/indexfile.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 7 insertions, 0 deletions
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 |