Added names to languages supported in OSM.

3 files changed, 68 insertions, 14 deletions

diff --git a/coding/coding_tests/multilang_utf8_string_test.cpp b/coding/coding_tests/multilang_utf8_string_test.cpp
index 4b694454f7..565a2f4674 100644
--- a/coding/coding_tests/multilang_utf8_string_test.cpp
+++ b/coding/coding_tests/multilang_utf8_string_test.cpp
@@ -102,3 +102,15 @@ UNIT_TEST(MultilangString_Unique)
   TEST(s.GetString(1, cmp), ());
   TEST_EQUAL(cmp, "yyy", ());
 }
+
+UNIT_TEST(MultilangString_LangNames)
+{
+  TEST_EQUAL("Беларуская", StringUtf8Multilang::GetLangNameByCode(StringUtf8Multilang::GetLangIndex("be")), ());
+
+  auto const & langs = StringUtf8Multilang::GetSupportedLanguages();
+  // Using size_t workaround, because our logging/testing macroses do not support passing POD types by value,
+  // only by reference. And our constant is a constexpr.
+  TEST_EQUAL(langs.size(), size_t(StringUtf8Multilang::kMaxSupportedLanguages), ());
+  auto const international = StringUtf8Multilang::GetLangIndex("int_name");
+  TEST_EQUAL(langs[international].m_code, "int_name", ());
+}
diff --git a/coding/multilang_utf8_string.cpp b/coding/multilang_utf8_string.cpp
index 9408e24e71..9c5ddc0c78 100644
--- a/coding/multilang_utf8_string.cpp
+++ b/coding/multilang_utf8_string.cpp
@@ -2,36 +2,65 @@
 
 #include "defines.hpp"
 
+namespace
+{
 // TODO(AlexZ): Review and replace invalid languages which does not map correctly to
 // iOS/Android locales/UI by valid and more popular ones.
 // Languages below were choosen after sorting name:<lang> tags in 2011.
 // Note, that it's not feasible to increase languages number here due to
 // our current encoding (6 bit to store language code).
-static char const * gLangs[] = {
-    "default",
-    "en", "ja", "fr", "ko_rm", "ar", "de", "int_name", "ru", "sv", "zh", "fi", "be", "ka", "ko",
-    "he", "nl", "ga", "ja_rm", "el", "it", "es", "zh_pinyin", "th", "cy", "sr", "uk", "ca", "hu",
-    "hsb", "eu", "fa", "br", "pl", "hy", "kn", "sl", "ro", "sq", "am", "fy", "cs", "gd", "sk",
-    "af", "ja_kana", "lb", "pt", "hr", "fur", "vi", "tr", "bg", "eo", "lt", "la", "kk", "gsw",
-    "et", "ku", "mn", "mk", "lv", "hi" };
-
+StringUtf8Multilang::Languages const g_languages = {{ {"default", "Native for each country"},
+    {"en", "English"}, {"ja", "日本語"}, {"fr", "Français"}, {"ko_rm", "Korean (Romanized)"},
+    {"ar", "العربية"}, {"de", "Deutsch"}, {"int_name", "International (Latin)"}, {"ru", "Русский"},
+    {"sv", "Svenska"}, {"zh", "中文"}, {"fi", "Suomi"}, {"be", "Беларуская"}, {"ka", "ქართული"},
+    {"ko", "한국어"}, {"he", "עברית"}, {"nl", "Nederlands"}, {"ga", "Gaeilge"},
+    {"ja_rm", "Japanese (Romanized)"}, {"el", "Ελληνικά"}, {"it", "Italiano"}, {"es", "Español"},
+    {"zh_pinyin", "Chinese (Pinyin)"}, {"th", "ไทย"}, {"cy", "Cymraeg"}, {"sr", "Српски"},
+    {"uk", "Українська"}, {"ca", "Català"}, {"hu", "Magyar"}, {"hsb", "Hornjoserbšćina"}, {"eu", "Euskara"},
+    {"fa", "فارسی"}, {"br", "Breton"}, {"pl", "Polski"}, {"hy", "Հայերէն"}, {"kn", "ಕನ್ನಡ"},
+    {"sl", "Slovenščina"}, {"ro", "Română"}, {"sq", "Shqipe"}, {"am", "አማርኛ"}, {"fy", "Frysk"},
+    {"cs", "Čeština"}, {"gd", "Gàidhlig"}, {"sk", "Slovenčina"}, {"af", "Afrikaans"},
+    {"ja_kana", "日本語(カタカナ)"}, {"lb", "Luxembourgish"}, {"pt", "Português"}, {"hr", "Hrvatski"},
+    {"fur", "Friulian"}, {"vi", "Tiếng Việt"}, {"tr", "Türkçe"}, {"bg", "Български"},
+    {"eo", "Esperanto"}, {"lt", "Lietuvių"}, {"la", "Latin"}, {"kk", "Қазақ"},
+    {"gsw", "Schwiizertüütsch"}, {"et", "Eesti"}, {"ku", "Kurdish"}, {"mn", "Mongolian"},
+    {"mk", "Македонски"}, {"lv", "Latviešu"}, {"hi", "हिन्दी"}
+}};
+}  // namespace
+
+// static
+StringUtf8Multilang::Languages const & StringUtf8Multilang::GetSupportedLanguages()
+{
+  // Asserts for generic class constants.
+  ASSERT_EQUAL(g_languages[kDefaultCode].m_code, string("default"), ());
+  ASSERT_EQUAL(g_languages[kInternationalCode].m_code, string("int_name"), ());
+  return g_languages;
+}
+// static
 int8_t StringUtf8Multilang::GetLangIndex(string const & lang)
 {
-  static_assert(ARRAY_SIZE(gLangs) == kMaxSupportedLanguages,
+  static_assert(g_languages.size() == kMaxSupportedLanguages,
                 "With current encoding we are limited to 64 languages max.");
 
-  for (size_t i = 0; i < ARRAY_SIZE(gLangs); ++i)
-    if (lang == gLangs[i])
+  for (size_t i = 0; i < g_languages.size(); ++i)
+    if (lang == g_languages[i].m_code)
       return static_cast<int8_t>(i);
 
   return kUnsupportedLanguageCode;
 }
-
+// static
 char const * StringUtf8Multilang::GetLangByCode(int8_t langCode)
 {
-  if (langCode < 0 || langCode > ARRAY_SIZE(gLangs) - 1)
+  if (langCode < 0 || langCode > g_languages.size() - 1)
+    return "";
+  return g_languages[langCode].m_code;
+}
+// static
+char const * StringUtf8Multilang::GetLangNameByCode(int8_t langCode)
+{
+  if (langCode < 0 || langCode > g_languages.size() - 1)
     return "";
-  return gLangs[langCode];
+  return g_languages[langCode].m_name;
 }
 
 size_t StringUtf8Multilang::GetNextIndex(size_t i) const
diff --git a/coding/multilang_utf8_string.hpp b/coding/multilang_utf8_string.hpp
index 1c3339bb71..eae663585b 100644
--- a/coding/multilang_utf8_string.hpp
+++ b/coding/multilang_utf8_string.hpp
@@ -37,15 +37,28 @@ class StringUtf8Multilang
 public:
   static int8_t constexpr kUnsupportedLanguageCode = -1;
   static int8_t constexpr kDefaultCode = 0;
+  static int8_t constexpr kInternationalCode = 7;
   /// How many languages we support on indexing stage. See full list in cpp file.
   /// TODO(AlexZ): Review and replace invalid languages by valid ones.
   static int8_t constexpr kMaxSupportedLanguages = 64;
 
+  struct Lang
+  {
+    /// OSM language code (e.g. for name:en it's "en" part).
+    char const * m_code;
+    /// Native language name.
+    char const * m_name;
+  };
+  using Languages = array<Lang, kMaxSupportedLanguages>;
+
+  static Languages const & GetSupportedLanguages();
 
   /// @returns kUnsupportedLanguageCode if language is not recognized.
   static int8_t GetLangIndex(string const & lang);
   /// @returns empty string if langCode is invalid.
   static char const * GetLangByCode(int8_t langCode);
+  /// @returns empty string if langCode is invalid.
+  static char const * GetLangNameByCode(int8_t langCode);
 
   inline bool operator== (StringUtf8Multilang const & rhs) const
   {