cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix error in user warning template (#11741)

This commit is contained in:
Eugen Rochko 2019-09-03 05:57:30 +02:00 committed by GitHub
parent 16c1abdb2d
commit 92a6fa6c90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/user_mailer/warning.html.haml
View File

@ -42,11 +42,11 @@
- unless @warning.text.blank? - unless @warning.text.blank?
= Formatter.instance.linkify(@warning.text) = Formatter.instance.linkify(@warning.text)
- unless @statuses&.empty? - if !@statuses.nil? && !@statuses.empty?
%p %p
%strong= t('user_mailer.warning.statuses') %strong= t('user_mailer.warning.statuses')
- unless @statuses&.empty? - if !@statuses.nil? && !@statuses.empty?
- @statuses.each_with_index do |status, i| - @statuses.each_with_index do |status, i|
= render 'notification_mailer/status', status: status, i: i + 1, highlighted: true = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true

2
app/views/user_mailer/warning.text.erb
View File

@ -7,7 +7,7 @@
<% end %> <% end %>
<%= @warning.text %> <%= @warning.text %>
<% unless @statuses&.empty? %> <% if !@statuses.nil? && !@statuses.empty? %>
<%= t('user_mailer.warning.statuses') %> <%= t('user_mailer.warning.statuses') %>
<% @statuses.each do |status| %> <% @statuses.each do |status| %>