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

diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb
index a84ba133985c0b4331f339f669f1fc9296358547..f53f5cf2806bfc022e10ffed06518095c0fdcf6f 100644 (file)
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -34,4 +34,11 @@
                   :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
     </li>
   <% end %>
+  <% if @user_block %>
+    <li class="nav-item">
+      <%= link_to t(".block", :id => @user_block.id),
+                  user_block_path(@user_block),
+                  :class => ["nav-link", { :active => action_name == "show" }] %>
+    </li>
+  <% end %>
 </ul>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0634fc2a0d1f52b1000462318c6bf42b0620d422..f9117ca1cc89add7669440805fbb59138644c7b0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2991,6 +2991,7 @@ en:
       blocks_on_user: "Blocks on %{user}"
       blocks_by_me: "Blocks by Me"
       blocks_by_user: "Blocks by %{user}"
+      block: "Block #%{id}"
   user_mutes:
     index:
       title: "Muted Users"