* apt-pkg/depcache.cc:

[apt.git] / apt-pkg / indexfile.cc

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index ca11fc11143e97ac2fed8324042800a839ba5aab..34fd71b20197473ec4fefba739dea80263598a68 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -13,6 +13,7 @@
 #include <apt-pkg/error.h>
 
 #include <clocale>
 #include <apt-pkg/error.h>
 
 #include <clocale>

+#include <cstring>

                                                                        /*}}}*/
 
 // Global list of Item supported
                                                                        /*}}}*/
 
 // Global list of Item supported


@@ -40,7 +41,6 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type)
    return 0;
 }
                                                                        /*}}}*/
    return 0;
 }
                                                                        /*}}}*/

-    

 // IndexFile::ArchiveInfo - Stub                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // IndexFile::ArchiveInfo - Stub                                       /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -89,8 +89,11 @@ bool pkgIndexFile::TranslationsAvailable()
 
 bool pkgIndexFile::CheckLanguageCode(const char *Lang)
 {
 
 bool pkgIndexFile::CheckLanguageCode(const char *Lang)
 {

-  if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_'))
-    return true;
+  if (strlen(Lang) == 2 || 
+      strlen(Lang) == 3 ||
+      (strlen(Lang) > 3 && Lang[3] == '_') ||
+      (strlen(Lang) == 5 && Lang[2] == '_'))
+  return true;

 
   if (strcmp(Lang,"C") != 0)
     _error->Warning("Wrong language code %s", Lang);
 
   if (strcmp(Lang,"C") != 0)
     _error->Warning("Wrong language code %s", Lang);


@@ -112,13 +115,18 @@ string pkgIndexFile::LanguageCode()
      // 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_*)
      // 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++)
+     const char *need_full_langcode[] = { "cs_", 
+                                         "en_", 
+                                         "pt_",
+                                         "sv_",
+                                         "zh_", 
+                                         NULL };
+     for(const char **s = need_full_langcode;*s != NULL; s++)

        if(lang.find(*s) == 0)
           return lang.substr(0,5);
      
        if(lang.find(*s) == 0)
           return lang.substr(0,5);
      

-     if(lang.size() > 2)
-       return lang.substr(0,2);
+     if(lang.find("_") != lang.npos)
+       return lang.substr(0, lang.find("_"));

      else
        return lang;
   }
      else
        return lang;
   }