handle translated blank cases

Signed-off-by: Julien Buret <jburet@voyages-sncf.com>

Author: vsct-jburet

bot/connector-ga/src/main/kotlin/fr/vsct/tock/bot/connector/ga/extensions.kt

@@ -148,7 +148,7 @@ fun BotBus.richResponse(items: List<GAItem>, linkOutSuggestion: GALinkOutSuggest
 
 fun BotBus.richResponse(items: List<GAItem>, vararg suggestions: GASuggestion): GARichResponse = richResponse(items, null, *suggestions)
 
-fun BotBus.richResponse(text: String, linkOutSuggestion: GALinkOutSuggestion? = null): GARichResponse = richResponse(listOf(item(simpleResponse(textToSpeech = text))), linkOutSuggestion)
+fun BotBus.richResponse(text: String, linkOutSuggestion: GALinkOutSuggestion? = null): GARichResponse = richResponse(listOf(item(simpleResponse(text))), linkOutSuggestion)
 
 fun BotBus.optionValueSpec(simpleSelect: GASimpleSelect? = null,
                            listSelect: GAListSelect? = null,

translator/core/src/main/kotlin/fr/vsct/tock/translator/I18nLabel.kt

@@ -33,7 +33,7 @@ data class I18nLabel(
             ?: i18n.firstOrNull { it.locale.language == locale.language && it.interfaceType == userInterfaceType }
 
     fun findLabel(locale: Locale): I18nLocalizedLabel?
-            = i18n.firstOrNull { it.locale == locale }
-            ?: i18n.firstOrNull { it.locale.language == locale.language }
+            = i18n.firstOrNull { it.locale == locale && it.label.isNotBlank() }
+            ?: i18n.firstOrNull { it.locale.language == locale.language && it.label.isNotBlank() }
 
 }

translator/core/src/main/kotlin/fr/vsct/tock/translator/Translator.kt

@@ -121,11 +121,16 @@ object Translator {
                     voice.randomText()
                 }
             } else {
-                text?.randomText() ?: labelWithoutUserInterface(i18nLabel, defaultLabel, locale, textChat)
+                text?.randomText() ?: labelWithoutUserInterface(i18nLabel, defaultLabel, locale, defaultInterface)
             }
         } else {
-            return i18nLabel.findLabel(locale, userInterfaceType)?.randomText()
-                    ?: labelWithoutUserInterface(i18nLabel, defaultLabel, locale, userInterfaceType)
+            i18nLabel.findLabel(locale, userInterfaceType)?.randomText().run {
+                if (isNullOrBlank()) {
+                    labelWithoutUserInterface(i18nLabel, defaultLabel, locale, userInterfaceType)
+                } else {
+                    this!!
+                }
+            }
         }
     }