diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm index 7ffcac43d5..638648ed59 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm @@ -288,8 +288,11 @@ extern NSString * const kSearchStateKey = @"SearchStateKey"; { Framework & f = GetFramework(); UITextField * textField = self.searchTextField; - f.SaveSearchQuery(make_pair(textField.textInputMode.primaryLanguage.UTF8String, - textField.text.precomposedStringWithCompatibilityMapping.UTF8String)); + + string const locale = textField.textInputMode.primaryLanguage ? + textField.textInputMode.primaryLanguage.UTF8String : + self.tableViewController.searchParams.m_inputLocale; + f.SaveSearchQuery(make_pair(locale, textField.text.precomposedStringWithCompatibilityMapping.UTF8String)); f.ActivateUserMark(nullptr, true); [self.searchTextField resignFirstResponder]; self.rootView.compact = YES; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h index 7fe5523945..f32688129d 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.h @@ -22,5 +22,6 @@ - (nonnull instancetype)initWithDelegate:(nonnull id)delegate; - (void)searchText:(nonnull NSString *)text forInputLocale:(nullable NSString *)locale; +- (search::SearchParams const &)searchParams; @end diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm index c07635c6a5..6cbec90e4e 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/TableView/MWMSearchTableViewController.mm @@ -65,6 +65,11 @@ LocationObserver> return self; } +- (search::SearchParams const &)searchParams +{ + return searchParams; +} + - (void)viewDidLoad { [super viewDidLoad];