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

[iOS] Fixed getting current input language.

Browse source
This commit is contained in:
vng 2016-03-28 20:23:50 +03:00
parent b37040f8f7
commit 4f47d19a4b
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
iphone/Maps/Classes/MapDownloader/MWMMapDownloaderViewController.mm
View file

@ -107,12 +107,10 @@ using namespace storage;
}
else
{
NSArray<NSString *> * activeInputModes = [UITextInputMode activeInputModes];
if (activeInputModes.count != 0)
{
NSString * primaryLanguage = ((UITextInputMode *)activeInputModes[0]).primaryLanguage;
NSString * primaryLanguage = self.searchBar.textInputMode.primaryLanguage;
if (primaryLanguage)
m_searchParams.m_inputLocale = primaryLanguage.UTF8String;
}
m_searchParams.m_query = searchText.precomposedStringWithCompatibilityMapping.UTF8String;
GetFramework().SearchInDownloader(m_searchParams);
}

6
map/framework.cpp
View file

@ -1085,9 +1085,9 @@ bool Framework::Search(search::SearchParams const & params)
bool Framework::GetGroupCountryIdFromFeature(FeatureType const & ft, string & name) const
{
static vector<int8_t> const langIndices = {StringUtf8Multilang::GetLangIndex("en"),
FeatureType::DEFAULT_LANG,
StringUtf8Multilang::kInternationalCode};
int8_t langIndices[] = { StringUtf8Multilang::GetLangIndex("en"),
StringUtf8Multilang::kDefaultCode,
StringUtf8Multilang::kInternationalCode };
for (auto const langIndex : langIndices)
{