소스 검색

* 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 16 년 전
부모
커밋
8f40076991
2개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. 2 0
      apt-pkg/indexfile.cc
  2. 5 0
      debian/changelog

+ 2 - 0
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;
   }

+ 5 - 0
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