diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp index bd62178906..56f324ed95 100644 --- a/indexer/feature_utils.cpp +++ b/indexer/feature_utils.cpp @@ -94,7 +94,7 @@ bool GetBestName(StringUtf8Multilang const & src, vector const & priorit return bestIndex < priorityList.size(); } -vector GetSimilarToDeviceLanguages(int8_t deviceLang) +vector GetSimilarLanguages(int8_t lang) { static unordered_map> const kSimilarLanguages = { {GetIndex("be"), {GetIndex("ru")}}, @@ -102,7 +102,7 @@ vector GetSimilarToDeviceLanguages(int8_t deviceLang) {GetIndex("ko"), {GetIndex("ko_rm")}}, {GetIndex("zh"), {GetIndex("zh_pinyin")}}}; - auto const it = kSimilarLanguages.find(deviceLang); + auto const it = kSimilarLanguages.find(lang); if (it != kSimilarLanguages.cend()) return it->second; @@ -114,7 +114,7 @@ bool IsNativeLang(feature::RegionData const & regionData, int8_t deviceLang) if (regionData.HasLanguage(deviceLang)) return true; - for (auto const lang : GetSimilarToDeviceLanguages(deviceLang)) + for (auto const lang : GetSimilarLanguages(deviceLang)) { if (regionData.HasLanguage(lang)) return true; @@ -129,7 +129,7 @@ vector MakeLanguagesPriorityList(int8_t deviceLang, bool preferDefault) if (preferDefault) langPriority.push_back(StrUtf8::kDefaultCode); - auto const similarLangs = GetSimilarToDeviceLanguages(deviceLang); + auto const similarLangs = GetSimilarLanguages(deviceLang); langPriority.insert(langPriority.cend(), similarLangs.cbegin(), similarLangs.cend()); langPriority.insert(langPriority.cend(), {StrUtf8::kInternationalCode, StrUtf8::kEnglishCode}); @@ -328,7 +328,7 @@ vector GetSimilar(int8_t lang) { vector langs = {lang}; - auto const similarLangs = GetSimilarToDeviceLanguages(lang); + auto const similarLangs = GetSimilarLanguages(lang); langs.insert(langs.cend(), similarLangs.cbegin(), similarLangs.cend()); return langs; } diff --git a/indexer/feature_utils.hpp b/indexer/feature_utils.hpp index 83af595c96..4db3e2832a 100644 --- a/indexer/feature_utils.hpp +++ b/indexer/feature_utils.hpp @@ -20,14 +20,14 @@ namespace feature // Returns following languages given |lang|: // - |lang|; - // - similar to |lang| languages if provided; + // - languages that we know are similar to |lang|; std::vector GetSimilar(int8_t deviceLang); /// When the language of the device is equal to one of the languages of the MWM /// (or similar to device languages) only single name scheme is used. See GetReadableName method. /// Primary name using priority: /// - device language name; - /// - similar to device languages if provided; + /// - languages that we know are similar to device language; /// - international name; /// - english name; /// - transliterated name (if allowed). @@ -46,7 +46,7 @@ namespace feature /// the priority is the following: /// - device language name; /// - default name; - /// - similar to device languages if provided; + /// - languages that we know are similar to device language; /// - international name; /// - english name; /// - transliterated name (if allowed); @@ -54,7 +54,7 @@ namespace feature /// When MWM does not contain user's language (or similar to device languages), /// the priority is the following: /// - device language name; - /// - similar to device languages if provided; + /// - languages that we know are similar to device language; /// - international name; /// - english name; /// - transliterated name (if allowed); @@ -78,7 +78,7 @@ namespace feature /// the priority is the following: /// - device language code; /// - default language code if MWM contains user's language (or similar to device languages if provided); - /// - similar to device languages if provided; + /// - languages that we know are similar to device language; /// - international language code; /// - english language code; std::vector GetDescriptionLangPriority(RegionData const & regionData, int8_t const deviceLang);