diff options
author | vng <viktor.govako@gmail.com> | 2014-09-03 03:11:47 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:25:51 +0300 |
commit | 2a992422b9b2186380c34f06ca14098cad2fed53 (patch) | |
tree | 170f73bb32509971411373b58f9ea48cc2624c3d /map/address_finder.cpp | |
parent | ad33728c60ac938ca320f5898bde4d6abd251833 (diff) |
[categories] Do correct distinguishing of current language and current locale (zh, zh-Hans, zh-Hant).
Diffstat (limited to 'map/address_finder.cpp')
-rw-r--r-- | map/address_finder.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/map/address_finder.cpp b/map/address_finder.cpp index 0daaa6a967..b877cfe2dc 100644 --- a/map/address_finder.cpp +++ b/map/address_finder.cpp @@ -357,9 +357,9 @@ namespace } } - void FillAddress(search::Engine const * eng, search::AddressInfo & info, string const & lang) + void FillAddress(search::Engine const * eng, search::AddressInfo & info) { - int8_t const locale = CategoriesHolder::MapLocaleToInteger(lang); + int8_t const locale = CategoriesHolder::MapLocaleToInteger(languages::GetCurrentOrig()); SortResults(); @@ -485,8 +485,7 @@ void Framework::GetAddressInfoForGlobalPoint(m2::PointD const & pt, search::Addr DoGetAddressInfo getAddress(pt, scale, GetChecker(), addressR); m_model.ForEachFeature(rect, getAddress, scale); - // @TODO Pass language as a parameter from UI - getAddress.FillAddress(GetSearchEngine(), info, languages::CurrentLanguage()); + getAddress.FillAddress(GetSearchEngine(), info); // @todo Temporarily commented - it's slow and not used in UI //GetLocality(pt, info); @@ -509,8 +508,7 @@ void Framework::GetAddressInfo(FeatureType const & ft, m2::PointD const & pt, se // FeatureType::WORST_GEOMETRY - no need to check on visibility DoGetAddressInfo getAddress(pt, FeatureType::WORST_GEOMETRY, GetChecker(), addressR); getAddress(ft); - // @TODO Pass language as a parameter from UI - getAddress.FillAddress(GetSearchEngine(), info, languages::CurrentLanguage()); + getAddress.FillAddress(GetSearchEngine(), info); /// @todo Temporarily commented - it's slow and not used in UI //GetLocality(pt, info); |