Merge pull request #180 from nyaruka/broadcast_languages

Broadcast languages
nyaruka · Mar 13, 2018 · 666ef45 · 666ef45
2 parents d53330d + ec38a7d
commit 666ef45
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/flows/actions/send_broadcast.go b/flows/actions/send_broadcast.go
@@ -53,9 +53,10 @@ func (a *SendBroadcastAction) Execute(run flows.FlowRun, step flows.Step, log fl
 	}
 
 	translations := make(map[utils.Language]*events.BroadcastTranslation)
+	languages := append(utils.LanguageList{run.Flow().Language()}, run.Flow().Translations().Languages()...)
 
 	// evaluate the broadcast in each language we have translations for
-	for _, language := range run.Session().Environment().Languages() {
+	for _, language := range languages {
 		languages := utils.LanguageList{language, run.Flow().Language()}.RemoveDuplicates()
 
 		evaluatedText, evaluatedAttachments, evaluatedQuickReplies := a.evaluateMessage(run, languages, a.Text, a.Attachments, a.QuickReplies, log)

diff --git a/flows/definition/flow.go b/flows/definition/flow.go
@@ -98,7 +98,7 @@ func ReadFlow(data json.RawMessage) (flows.Flow, error) {
 	f.name = envelope.Name
 	f.language = envelope.Language
 	f.expireAfterMinutes = envelope.ExpireAfterMinutes
-	f.translations = &envelope.Localization
+	f.translations = envelope.Localization
 
 	f.nodes = make([]flows.Node, len(envelope.Nodes))
 	f.nodeMap = make(map[flows.NodeUUID]flows.Node)

diff --git a/flows/definition/localization.go b/flows/definition/localization.go
@@ -25,8 +25,16 @@ func (t *languageTranslations) GetTextArray(uuid utils.UUID, key string) []strin
 // flowTranslations are our top level container for all the translations for a language
 type flowTranslations map[utils.Language]*languageTranslations
 
-func (t *flowTranslations) GetLanguageTranslations(lang utils.Language) flows.Translations {
-	translations, found := (*t)[lang]
+func (t flowTranslations) Languages() utils.LanguageList {
+	languages := make(utils.LanguageList, 0, len(t))
+	for lang := range t {
+		languages = append(languages, lang)
+	}
+	return languages
+}
+
+func (t flowTranslations) GetLanguageTranslations(lang utils.Language) flows.Translations {
+	translations, found := t[lang]
 	if found {
 		return translations
 	}

diff --git a/flows/interfaces.go b/flows/interfaces.go
@@ -194,6 +194,7 @@ type Wait interface {
 // FlowTranslations provide a way to get the Translations for a flow for a specific language
 type FlowTranslations interface {
 	GetLanguageTranslations(utils.Language) Translations
+	Languages() utils.LanguageList
 }
 
 // Translations provide a way to get the translation for a specific language for a uuid/key pair