IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: html-safe dialog.message, clarify poll error (#24388)

Browse Source
This commit is contained in:
Kris
2023-11-15 11:37:25 -05:00
committed by GitHub
parent ed611a63ae
commit 91d5b66a9c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/dialog-holder/addon/components/dialog-holder.hbs
View File

@@ -27,7 +27,7 @@
@model={{this.dialog.bodyComponentModel}} @model={{this.dialog.bodyComponentModel}}
/> />
{{else if this.dialog.message}} {{else if this.dialog.message}}
<p>{{this.dialog.message}}</p> <p>{{html-safe this.dialog.message}}</p>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}

2
plugins/poll/config/locales/server.en.yml
View File

@@ -12,7 +12,7 @@ en:
poll: "poll" poll: "poll"
invalid_argument: "Invalid value '%{value}' for argument '%{argument}'." invalid_argument: "Invalid value '%{value}' for argument '%{argument}'."
multiple_polls_without_name: "There are multiple polls without a name. Use the '<code>name</code>' attribute to uniquely identify your polls." multiple_polls_without_name: "When creating multiple polls, include unique names by adding <code>name=example</code> to your <code>[poll]</code> tags."
multiple_polls_with_same_name: "There are multiple polls with the same name: <strong>%{name}</strong>. Use the '<code>name</code>' attribute to uniquely identify your polls." multiple_polls_with_same_name: "There are multiple polls with the same name: <strong>%{name}</strong>. Use the '<code>name</code>' attribute to uniquely identify your polls."
default_poll_must_have_at_least_1_option: "Poll must have at least 1 option." default_poll_must_have_at_least_1_option: "Poll must have at least 1 option."