Merge remote-tracking branch 'upstream/pull/5184'

app/controllers/user_blocks_controller.rb

@@ -25,7 +25,7 @@ class UserBlocksController < ApplicationController
     @show_user_name = true
     @show_creator_name = true
 
-    render :partial => "blocks" if turbo_frame_request_id == "pagination"
+    render :partial => "page" if turbo_frame_request_id == "pagination"
   end
 
   def show
@@ -127,7 +127,7 @@ class UserBlocksController < ApplicationController
     @show_user_name = false
     @show_creator_name = true
 
-    render :partial => "blocks" if turbo_frame_request_id == "pagination"
+    render :partial => "page" if turbo_frame_request_id == "pagination"
   end
 
   ##
@@ -142,7 +142,7 @@ class UserBlocksController < ApplicationController
     @show_user_name = true
     @show_creator_name = false
 
-    render :partial => "blocks" if turbo_frame_request_id == "pagination"
+    render :partial => "page" if turbo_frame_request_id == "pagination"
   end
 
   private

app/views/user_blocks/blocks_by.html.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 <% unless @user_blocks.empty? %>
-<%= render :partial => "blocks" %>
+<%= render :partial => "page" %>
 <% else %>
 <p><%= t ".empty", :name => @user.display_name %></p>
 <% end %>

app/views/user_blocks/blocks_on.html.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 <% unless @user_blocks.empty? %>
-<%= render :partial => "blocks" %>
+<%= render :partial => "page" %>
 <% else %>
 <p><%= t ".empty", :name => @user.display_name %></p>
 <% end %>

app/views/user_blocks/index.html.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 <% unless @user_blocks.empty? %>
-<%= render :partial => "blocks" %>
+<%= render :partial => "page" %>
 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>

config/locales/en.yml

@@ -2927,7 +2927,7 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
-    blocks:
+    page:
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"