* apt-pkg/indexfile.cc:

  - add special cases for various languages like pt_BR, zh_CN etc

diff --git a/BUGS b/BUGS
index 6bbc6f839961bbd98f528781e8b457e59708414a..a7b6b111472666382e282317168bb39024bf2f40 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -6,3 +6,4 @@ DDTP problems:
   enviroment or Translations apt variable
 - there needs to be a list of locales (pt, sv, en) that need
   both language and country code to get the right file
+  (is in the code in indexfile::LanguageCode(), just a bit ugly 

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 496e68b8bbd3945a9db2215c9c192caaddf9e763..bb2210bf677cebcaf64516fa86bd0ce1b9d1c62c 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -113,11 +113,14 @@ string pkgIndexFile::LanguageCode()
   {
      string lang = std::setlocale(LC_MESSAGES,NULL);
 
-     // FIXME: this needs to be added
      // we have a mapping of the language codes that contains all the language
      // codes that need the country code as well 
      // (like pt_BR, pt_PT, sv_SE, zh_*, en_*)
-
+     char *need_full_langcode[] = { "pt","sv","zh","en", NULL };
+     for(char **s = need_full_langcode;*s != NULL; s++)
+       if(lang.find(*s) == 0)
+          return lang.substr(0,5);
+     
      if(lang.size() > 2)
        return lang.substr(0,2);
      else