Merge pull request #230 from bykoianko/tts-unsupported-languages-by-app

Using English in TTS if sound.txt doesn't contain the current languag

1 files changed, 15 insertions, 9 deletions

diff --git a/routing/turns_tts_text.cpp b/routing/turns_tts_text.cpp
index 6493131733..4682490d31 100644
--- a/routing/turns_tts_text.cpp
+++ b/routing/turns_tts_text.cpp
@@ -36,16 +36,12 @@ namespace sound
 {
 void GetTtsText::SetLocale(string const & locale)
 {
-  m_locale = locale;
-  m_getCurLang.reset(new platform::GetTextById(platform::TextSource::TtsSound, locale));
-  /// @todo Factor out file check from constructor and do not create m_getCurLang object in case of error.
-  ASSERT(m_getCurLang, ());
+  m_getCurLang = platform::GetTextByIdFactory(platform::TextSource::TtsSound, locale);
 }
 
-void GetTtsText::ForTestingSetLocaleWithJson(string const & jsonBuffer)
+void GetTtsText::ForTestingSetLocaleWithJson(string const & jsonBuffer, string const & locale)
 {
-  m_getCurLang.reset(new platform::GetTextById(jsonBuffer));
-  ASSERT(m_getCurLang && m_getCurLang->IsValid(), ());
+  m_getCurLang = platform::ForTestingGetTextByIdFactory(jsonBuffer, locale);
 }
 
 string GetTtsText::operator()(Notification const & notification) const
@@ -63,14 +59,24 @@ string GetTtsText::operator()(Notification const & notification) const
   return distStr + " " + dirStr;
 }
 
+string GetTtsText::GetLocale() const
+{
+  if (m_getCurLang == nullptr)
+  {
+    ASSERT(false, ());
+    return string();
+  }
+  return m_getCurLang->GetLocale();
+}
+
 string GetTtsText::GetTextById(string const & textId) const
 {
   ASSERT(!textId.empty(), ());
 
-  if (!m_getCurLang || !m_getCurLang->IsValid())
+  if (m_getCurLang == nullptr)
   {
     ASSERT(false, ());
-    return "";
+    return string();
   }
   return (*m_getCurLang)(textId);
 }