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

diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index 7d61366be9e071f0cd0360d48bf00ba22b968635..c42c2659db0b09aae46b17430b3cac0e25283790 100644 (file)
--- a/app/controllers/user_blocks_controller.rb
+++ b/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

diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb
index 97e6351a0a108561ac495534a8e30c75ab13cb11..fc5f7cbbc85bfaeb57c78d71a383aea88d73125d 100644 (file)
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -13,9 +13,9 @@
   </div>
 <% end -%>
 <% elsif params[:bbox] %>
-  <p class="mx-3"><%= t(params[:max_id] ? ".no_more_area" : ".empty_area") %></p>
+  <p class="mx-3"><%= params[:max_id] ? t(".no_more_area") : t(".empty_area") %></p>
 <% elsif params[:display_name] %>
-  <p class="mx-3"><%= t(params[:max_id] ? ".no_more_user" : ".empty_user") %></p>
+  <p class="mx-3"><%= params[:max_id] ? t(".no_more_user") : t(".empty_user") %></p>
 <% else %>
-  <p class="mx-3"><%= t(params[:max_id] ? ".no_more" : ".empty") %></p>
+  <p class="mx-3"><%= params[:max_id] ? t(".no_more") : t(".empty") %></p>
 <% end %>

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_page.html.erb
similarity index 100%
rename from app/views/user_blocks/_blocks.html.erb
rename to app/views/user_blocks/_page.html.erb

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 38254a5a3d166781f1e3e80bfadb5c932c0c2b9f..73748e5570757fffcdf16294fbf781bbcfb2f6d1 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/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 %>

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 38254a5a3d166781f1e3e80bfadb5c932c0c2b9f..73748e5570757fffcdf16294fbf781bbcfb2f6d1 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/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 %>

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index 854d62037f4ace3e7e7a9f76398235a20867fb6a..5b040e2b5630cbef31f9c051c68015a3e4c019e2 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/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 %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9a383569ee3ce97241b24b4dcdf5c612e3a6c5f4..926189809802bbc74224c7a61de6a1df09946edf 100644 (file)
--- a/config/locales/en.yml
+++ b/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"