From: Tom Hughes Date: Mon, 1 Apr 2024 17:16:58 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/4635' X-Git-Tag: live~1200 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/23cb749d79c98086ef3baea2d2f517923d12b2b7?hp=6e5e25736631c1b3f8980bdb5ab5bdbdd69f0843 Merge remote-tracking branch 'upstream/pull/4635' --- diff --git a/app/views/diary_entries/subscribe.html.erb b/app/views/diary_entries/subscribe.html.erb index e18be2b6d..62d734ff2 100644 --- a/app/views/diary_entries/subscribe.html.erb +++ b/app/views/diary_entries/subscribe.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

<%= t ".heading", :user => @diary_entry.user.display_name %>

+

<%= t ".heading" %>

<% end %> <%= render :partial => "diary_entry_heading", :object => @diary_entry, :as => "diary_entry" %> diff --git a/app/views/diary_entries/unsubscribe.html.erb b/app/views/diary_entries/unsubscribe.html.erb index e18be2b6d..62d734ff2 100644 --- a/app/views/diary_entries/unsubscribe.html.erb +++ b/app/views/diary_entries/unsubscribe.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

<%= t ".heading", :user => @diary_entry.user.display_name %>

+

<%= t ".heading" %>

<% end %> <%= render :partial => "diary_entry_heading", :object => @diary_entry, :as => "diary_entry" %>