diff --git a/indexer/new_feature_categories.cpp b/indexer/new_feature_categories.cpp index 42cc6a2b7c..cded82d8f2 100644 --- a/indexer/new_feature_categories.cpp +++ b/indexer/new_feature_categories.cpp @@ -60,10 +60,8 @@ void NewFeatureCategories::AddLanguage(string lang) m_categoriesByLang[lang] = names; } -NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query, - string const & queryLang) const +NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query, string lang) const { - string lang = queryLang; auto langCode = CategoriesHolder::MapLocaleToInteger(lang); if (langCode == CategoriesHolder::kUnsupportedLocaleCode) { @@ -83,7 +81,7 @@ NewFeatureCategories::TNames NewFeatureCategories::Search(string const & query, my::SortUnique(result); alohalytics::TStringMap const stats = { - {"query", query}, {"queryLang", queryLang}, {"lang", lang}}; + {"query", query}, {"lang", lang}}; alohalytics::LogEvent("searchNewFeatureCategory", stats); return result; diff --git a/indexer/new_feature_categories.hpp b/indexer/new_feature_categories.hpp index 81f7aa7036..4148b87854 100644 --- a/indexer/new_feature_categories.hpp +++ b/indexer/new_feature_categories.hpp @@ -38,9 +38,9 @@ public: // Returns names (in language |queryLang|) and types of categories that have a synonym containing // the substring |query| (in any language that was added before). - // If |queryLang| is not supported, "en" is used. + // If |lang| is not supported, "en" is used. // The returned list is sorted. - TNames Search(string const & query, string const & queryLang) const; + TNames Search(string const & query, string lang) const; // Returns all registered names of categories in language |lang| and // types corresponding to these names. The language must have been added before. diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm index 2a58982d63..73a8ccb3fb 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm @@ -263,5 +263,4 @@ string translatedTwine(string const & twine) else return ""; } - } // namespace tts diff --git a/iphone/Maps/Classes/LocaleTranslator.mm b/iphone/Maps/Classes/LocaleTranslator.mm index 0b10049ebd..d3908308df 100644 --- a/iphone/Maps/Classes/LocaleTranslator.mm +++ b/iphone/Maps/Classes/LocaleTranslator.mm @@ -20,5 +20,4 @@ string bcp47ToTwineLanguage(NSString const * bcp47LangName) // Taking two first symbols of a language name. For example ru-RU -> ru return [[bcp47LangName substringToIndex:2] UTF8String]; } - } // namespace locale_translator