From 6c4968eafd9c276fe6df60d874749f47cc19dc6c Mon Sep 17 00:00:00 2001 From: Gregory Igelmund Date: Wed, 6 Mar 2024 10:35:01 +0100 Subject: [PATCH] Remove now-obsolete partials in app/views/messages/* --- app/views/messages/_inbox_count.html.erb | 7 ------- app/views/messages/_muted_count.html.erb | 3 --- app/views/messages/_outbox_count.html.erb | 3 --- app/views/messages/inbox.html.erb | 2 +- app/views/messages/muted.html.erb | 2 +- app/views/messages/outbox.html.erb | 2 +- 6 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 app/views/messages/_inbox_count.html.erb delete mode 100644 app/views/messages/_muted_count.html.erb delete mode 100644 app/views/messages/_outbox_count.html.erb diff --git a/app/views/messages/_inbox_count.html.erb b/app/views/messages/_inbox_count.html.erb deleted file mode 100644 index 86bb2c474..000000000 --- a/app/views/messages/_inbox_count.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -

-<%= t "messages.inbox.messages", - :new_messages => t("messages.inbox.new_messages", - :count => current_user.new_messages.size), - :old_messages => t("messages.inbox.old_messages", - :count => current_user.messages.size - current_user.new_messages.size) %> -

diff --git a/app/views/messages/_muted_count.html.erb b/app/views/messages/_muted_count.html.erb deleted file mode 100644 index 207973d58..000000000 --- a/app/views/messages/_muted_count.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -

-<%= t "messages.muted.messages", :count => current_user.muted_messages.size %> -

diff --git a/app/views/messages/_outbox_count.html.erb b/app/views/messages/_outbox_count.html.erb deleted file mode 100644 index 5b27f1d6e..000000000 --- a/app/views/messages/_outbox_count.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -

-<%= t "messages.outbox.messages", :count => current_user.sent_messages.size %> -

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb index 611b0b1c9..835d70a74 100644 --- a/app/views/messages/inbox.html.erb +++ b/app/views/messages/inbox.html.erb @@ -4,7 +4,7 @@ <%= render :partial => "heading", :locals => { :active_link_path => inbox_messages_path } %> -<%= render :partial => "inbox_count" %> +

<%= t "messages.inbox.messages", :new_messages => t(".new_messages", :count => current_user.new_messages.size), :old_messages => t(".old_messages", :count => current_user.messages.size - current_user.new_messages.size) %>

<% if current_user.messages.size > 0 %> <%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.messages, :inner_partial => "message_summary" } %> diff --git a/app/views/messages/muted.html.erb b/app/views/messages/muted.html.erb index 8e97abc7f..40c74e915 100644 --- a/app/views/messages/muted.html.erb +++ b/app/views/messages/muted.html.erb @@ -4,6 +4,6 @@ <%= render :partial => "heading", :locals => { :active_link_path => muted_messages_path } %> -<%= render :partial => "muted_count" %> +

<%= t ".messages", :count => current_user.muted_messages.size %>

<%= render :partial => "messages_table", :locals => { :columns => %w[from subject date], :messages => current_user.muted_messages, :inner_partial => "message_summary" } %> diff --git a/app/views/messages/outbox.html.erb b/app/views/messages/outbox.html.erb index 096427e8d..5cb357f6f 100644 --- a/app/views/messages/outbox.html.erb +++ b/app/views/messages/outbox.html.erb @@ -4,7 +4,7 @@ <%= render :partial => "heading", :locals => { :active_link_path => outbox_messages_path } %> -<%= render :partial => "outbox_count" %> +

<%= t ".messages", :count => current_user.sent_messages.size %>

<% if current_user.sent_messages.size > 0 %> <%= render :partial => "messages_table", :locals => { :columns => %w[to subject date], :messages => current_user.sent_messages, :inner_partial => "sent_message_summary" } %> -- 2.39.5