Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaria Volvenkova <d.volvenkova@corp.mail.ru>2017-02-14 16:19:51 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2017-02-14 16:33:07 +0300
commitf1eeef458bc5177db98d840d75f24e77e0dd4938 (patch)
tree5845098d211c378d48cf61b106de482cc553854d /indexer/categories_holder.cpp
parent1c7b0ae8d7e324a6f14a7840aabad261a2a577f5 (diff)
Use en category name if there is no translation for current locale language.
Diffstat (limited to 'indexer/categories_holder.cpp')
-rw-r--r--indexer/categories_holder.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 382d21f7f9..c3871b2628 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -314,6 +314,7 @@ bool CategoriesHolder::GetNameByType(uint32_t type, int8_t locale, string & name
{
auto const range = m_type2cat.equal_range(type);
+ string enName;
for (auto it = range.first; it != range.second; ++it)
{
Category const & cat = *it->second;
@@ -324,12 +325,16 @@ bool CategoriesHolder::GetNameByType(uint32_t type, int8_t locale, string & name
name = synonym.m_name;
return true;
}
+ else if (enName.empty() && (synonym.m_locale == kEnglishCode))
+ {
+ enName = synonym.m_name;
+ }
}
}
- if (range.first != range.second)
+ if (!enName.empty())
{
- name = range.first->second->m_synonyms[0].m_name;
+ name = enName;
return true;
}