diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-05-05 10:16:02 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-05-05 10:16:02 +0200 |
| commit | 93bf52f9fc5535f6763a50f7d025d83abd11f38e (patch) | |
| tree | 58a998b5ff7ccc6375826c09b2bb0021734f3a21 | |
| parent | eea96cc7c1092f96c5929876608d09d9af292954 (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 9b85a8cf8..2f5bc2439 100644 --- 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 7ff516fc2..a8d0cda46 100644 --- 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 |