diff --git a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs index 3fbfd731447..16f06d85c9c 100644 --- a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs +++ b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs @@ -27,7 +27,7 @@ @model={{this.dialog.bodyComponentModel}} /> {{else if this.dialog.message}} -

{{this.dialog.message}}

+

{{html-safe this.dialog.message}}

{{/if}} {{/if}} diff --git a/plugins/poll/config/locales/server.en.yml b/plugins/poll/config/locales/server.en.yml index 18a54f8f32f..b9a2202930a 100644 --- a/plugins/poll/config/locales/server.en.yml +++ b/plugins/poll/config/locales/server.en.yml @@ -12,7 +12,7 @@ en: poll: "poll" invalid_argument: "Invalid value '%{value}' for argument '%{argument}'." - multiple_polls_without_name: "There are multiple polls without a name. Use the 'name' attribute to uniquely identify your polls." + multiple_polls_without_name: "When creating multiple polls, include unique names by adding name=example to your [poll] tags." multiple_polls_with_same_name: "There are multiple polls with the same name: %{name}. Use the 'name' attribute to uniquely identify your polls." default_poll_must_have_at_least_1_option: "Poll must have at least 1 option."