forked from organicmaps/organicmaps-tmp
[bookmarks] Make bookmark's title depend on map language
Resolves #10117 Signed-off-by: savsch <119003089+savsch@users.noreply.github.com>
This commit is contained in:
parent
1790a4dfca
commit
e1128b51fc
1 changed files with 5 additions and 3 deletions
|
@ -709,12 +709,14 @@ void SaveFeatureTypes(feature::TypesHolder const & types, kml::BookmarkData & bm
|
|||
|
||||
std::string GetPreferredBookmarkStr(kml::LocalizableString const & name)
|
||||
{
|
||||
return kml::GetPreferredBookmarkStr(name, languages::GetCurrentNorm());
|
||||
auto const mapLanguageNorm = languages::Normalize(languages::GetCurrentMapLanguage());
|
||||
return kml::GetPreferredBookmarkStr(name, mapLanguageNorm);
|
||||
}
|
||||
|
||||
std::string GetPreferredBookmarkStr(kml::LocalizableString const & name, feature::RegionData const & regionData)
|
||||
{
|
||||
return kml::GetPreferredBookmarkStr(name, regionData, languages::GetCurrentNorm());
|
||||
auto const mapLanguageNorm = languages::Normalize(languages::GetCurrentMapLanguage());
|
||||
return kml::GetPreferredBookmarkStr(name, regionData, mapLanguageNorm);
|
||||
}
|
||||
|
||||
std::string GetLocalizedFeatureType(std::vector<uint32_t> const & types)
|
||||
|
@ -751,7 +753,7 @@ std::string GetLocalizedBookmarkBaseType(BookmarkBaseType type)
|
|||
|
||||
std::string GetPreferredBookmarkName(kml::BookmarkData const & bmData)
|
||||
{
|
||||
return kml::GetPreferredBookmarkName(bmData, languages::GetCurrentOrig());
|
||||
return kml::GetPreferredBookmarkName(bmData, languages::GetCurrentMapLanguage());
|
||||
}
|
||||
|
||||
void ExpandRectForPreview(m2::RectD & rect)
|
||||
|
|
Loading…
Add table
Reference in a new issue