diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:45:25 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-17 10:45:25 +0100 |
| commit | b3bf32a21e4dfc43737f50f15d3f258c16d0cf83 (patch) | |
| tree | 37daa7d7725d3676115eea2c4d4a215bdd95c06d /app/views/user_mailer/warning.text.erb | |
| parent | 430d4427916b44e6a7c16db1899dfef2eec140fc (diff) | |
| parent | 14f436c457560862fafabd753eb314c8b8a8e674 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.
Diffstat (limited to 'app/views/user_mailer/warning.text.erb')
| -rw-r--r-- | app/views/user_mailer/warning.text.erb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/app/views/user_mailer/warning.text.erb b/app/views/user_mailer/warning.text.erb index bb6610c79..31d7308ae 100644 --- a/app/views/user_mailer/warning.text.erb +++ b/app/views/user_mailer/warning.text.erb @@ -3,11 +3,24 @@ === <% unless @warning.none_action? %> -<%= t "user_mailer.warning.explanation.#{@warning.action}" %> +<%= t "user_mailer.warning.explanation.#{@warning.action}", instance: @instance %> <% end %> +<% if @warning.text.present? %> <%= @warning.text %> -<% if !@statuses.nil? && !@statuses.empty? %> + +<% end %> +<% if @warning.report && !@warning.report.other? %> +**<%= t('user_mailer.warning.reason') %>** <%= t("user_mailer.warning.categories.#{@warning.report.category}") %> + +<% if @warning.report.violation? && @warning.report.rule_ids.present? %> +<% @warning.report.rules.each do |rule| %> +- <%= rule.text %> +<% end %> + +<% end %> +<% end %> +<% if !@statuses.empty? %> <%= t('user_mailer.warning.statuses') %> <% @statuses.each do |status| %> |