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

When the language of the user is equal to one of the languages of the MWM only single name scheme is used.

Browse source
This commit is contained in:
Daria Volvenkova 2017-04-21 15:50:58 +03:00
parent 202412a7ae
commit 315897aa9c
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
indexer/feature_utils.cpp
View file

@ -231,6 +231,11 @@ void GetPreferredNames(RegionData const & regionData, StringUtf8Multilang const
if (src.IsEmpty())
return;
// When the language of the user is equal to one of the languages of the MWM
// only single name scheme is used.
if (regionData.HasLanguage(deviceLang))
return GetReadableName(regionData, src, deviceLang, allowTranslit, primary);
vector<int8_t> const primaryCodes = {deviceLang,
StrUtf8::kInternationalCode,
StrUtf8::kEnglishCode};

21
indexer/indexer_tests/feature_names_test.cpp
View file

@ -169,6 +169,27 @@ UNIT_TEST(GetPrefferedNames)
}
}
UNIT_TEST(GetPrefferedNamesLocal)
{
feature::RegionData regionData;
regionData.SetLanguages({"kk", "ru"});
int8_t deviceLang = StrUtf8::GetLangIndex("ru");
string primary, secondary;
bool const allowTranslit = true;
{
StrUtf8 src;
src.AddString("default", "default name");
src.AddString("en", "en name");
feature::GetPreferredNames(regionData, src, deviceLang, allowTranslit, primary, secondary);
TEST_EQUAL(primary, "default name", ());
TEST_EQUAL(secondary, "", ());
}
}
UNIT_TEST(GetReadableName)
{
feature::RegionData regionData;