From 108fb2820081c6d20909a7c6a03e7d88e5bc4866 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@mapswithme.com>
Date: Sat, 2 Aug 2014 18:39:00 +0300
Subject: [PATCH] =?UTF-8?q?We=20don=E2=80=99t=20need=20any=20specific=20fi?=
 =?UTF-8?q?lters=20for=20Chinese,=20it=20will=20be=20cut=20off=20to=20?=
 =?UTF-8?q?=E2=80=9Czh=E2=80=9D=20anyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform/preferred_languages.cpp | 11 -----------
 platform/preferred_languages.hpp |  3 +++
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp
index 3d47c31cda..a11a953171 100644
--- a/platform/preferred_languages.cpp
+++ b/platform/preferred_languages.cpp
@@ -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());
   {
diff --git a/platform/preferred_languages.hpp b/platform/preferred_languages.hpp
index 0feace7efc..ff14af39aa 100644
--- a/platform/preferred_languages.hpp
+++ b/platform/preferred_languages.hpp
@@ -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();
 //@}