RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

We don’t need any specific filters for Chinese, it will be cut off to “zh” anyway

Browse source
This commit is contained in:
Alex Zolotarev 2014-08-02 18:39:00 +03:00 • committed by Alex Zolotarev
parent f01f3780fe
commit 108fb28200
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
platform/preferred_languages.cpp
View file

@ -45,14 +45,6 @@ static const MSLocale gLocales[] = {{0x1,"ar"},{0x2,"bg"},{0x3,"ca"},{0x4,"zh-Ha
namespace languages
{
struct ChineseSimplifiedFilter
{
bool operator() (string const & t) const
{
return ("zh-Hans" == t) || ("zh-rCN" == t);
}
};
class LangFilter
{
set<string> & m_known;
@ -81,9 +73,6 @@ public:
void FilterLanguages(vector<string> & langs)
{
// we do not support simplified chinese by the momenty, so remove it from collection
langs.erase(remove_if(langs.begin(), langs.end(), ChineseSimplifiedFilter()), langs.end());
// normalize languages: en-US -> en, ru_RU -> ru etc.
for_each(langs.begin(), langs.end(), NormalizeFilter());
{

3
platform/preferred_languages.hpp
View file

@ -10,6 +10,9 @@ namespace languages
/// @return system language preferences in the form "en|ru|es|zh"
string PreferredLanguages();
/// @return language code for current user in the form "en"
/// Returned languages are normalized to our supported languages in the core, see multilang_utf8_string.cpp
/// and should not be used with any sub-locales like zh-Hans/zh-Hant.
/// Some langs like Danish (da) are not supported too in the core
string CurrentLanguage();
//@}