cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-08-16 17:22:59 +01:00
commit 9e807aeca0
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/user_blocks/_navigation.html.erb
View file

@ -38,7 +38,7 @@
<li class="nav-item"> <li class="nav-item">
<%= link_to t(".block", :id => @user_block.id), <%= link_to t(".block", :id => @user_block.id),
user_block_path(@user_block), user_block_path(@user_block),
:class => ["nav-link", { :active => action_name == "show" }] %> :class => "nav-link active" %>
</li> </li>
<% end %> <% end %>
</ul> </ul>

9
app/views/user_blocks/edit.html.erb
View file

@ -1,12 +1,9 @@
<% @title = t ".title", :name => @user_block.user.display_name %> <% @title = t ".title", :name => @user_block.user.display_name %>
<% content_for :heading_class, "pb-0" %>
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %></h1> <h1><%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %></h1>
<nav class='secondary-actions'> <%= render :partial => "navigation" %>
<ul class='clearfix'>
<li><%= link_to t(".show"), @user_block %></li>
<li><%= link_to t(".back"), user_blocks_path %></li>
</ul>
</nav>
<% end %> <% end %>
<%= bootstrap_form_for(@user_block) do |f| %> <%= bootstrap_form_for(@user_block) do |f| %>

2
config/locales/en.yml
View file

@ -2941,8 +2941,6 @@ en:
title: "Editing block on %{name}" title: "Editing block on %{name}"
heading_html: "Editing block on %{name}" heading_html: "Editing block on %{name}"
period: "How long, starting now, the user will be blocked from the API for." period: "How long, starting now, the user will be blocked from the API for."
show: "View this block"
back: "View all blocks"
filter: filter:
block_period: "The blocking period must be one of the values selectable in the drop-down list." block_period: "The blocking period must be one of the values selectable in the drop-down list."
create: create: