Correct fix to display either translated category name for type (or it’s base type), or untranslated name.

1 files changed, 16 insertions, 3 deletions

diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 7ee9084732..e6678c55ca 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -202,10 +202,23 @@ bool CategoriesHolder::GetNameByType(uint32_t type, int8_t locale, string & name
 string CategoriesHolder::GetReadableFeatureType(uint32_t type, int8_t locale) const
 {
   ASSERT_NOT_EQUAL(type, 0, ());
+  uint8_t level = ftype::GetLevel(type);
+  ASSERT_GREATER(level, 0, ());
+
+  uint32_t originalType = type;
   string name;
-  if (GetNameByType(type, locale, name))
-    return name;
-  return classif().GetReadableObjectName(type);
+  while (true)
+  {
+    if (GetNameByType(type, locale, name))
+      return name;
+
+    if (--level == 0)
+      break;
+
+    ftype::TruncValue(type, level);
+  }
+
+  return classif().GetReadableObjectName(originalType);
 }
 
 bool CategoriesHolder::IsTypeExist(uint32_t type) const