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

Merge branch 'pull/3112'

Browse source
This commit is contained in:
Andy Allan 2021-03-17 16:07:43 +00:00
commit a2ddcda911
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/views/messages/inbox.html.erb
View file

@ -3,7 +3,14 @@
<% end %> <% end %>
<% content_for :heading do %> <% content_for :heading do %>
<h2><%= t ".my_inbox" %>/<%= link_to t(".outbox"), outbox_messages_path %></h2> <ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link active"><%= t ".my_inbox" %></a>
</li>
<li class="nav-item">
<%= link_to t(".my_outbox"), outbox_messages_path, :class => "nav-link" %>
</li>
</ul>
<% end %> <% end %>
<h4><%= render :partial => "message_count" %></h4> <h4><%= render :partial => "message_count" %></h4>

9
app/views/messages/outbox.html.erb
View file

@ -3,7 +3,14 @@
<% end %> <% end %>
<% content_for :heading do %> <% content_for :heading do %>
<h2><%= t(".my_inbox_html", :inbox_link => link_to(t(".inbox"), inbox_messages_path)) %>/<%= t ".outbox" %></h2> <ul class="nav nav-pills">
<li class="nav-item">
<%= link_to t(".my_inbox"), inbox_messages_path, :class => "nav-link" %>
</li>
<li class="nav-item">
<a class="nav-link active"><%= t ".my_outbox" %></a>
</li>
</ul>
<% end %> <% end %>
<h4><%= t ".messages", :count => current_user.sent_messages.size %></h4> <h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>

7
config/locales/en.yml
View file

@ -1519,7 +1519,7 @@ en:
inbox: inbox:
title: "Inbox" title: "Inbox"
my_inbox: "My Inbox" my_inbox: "My Inbox"
outbox: "outbox" my_outbox: "My Outbox"
messages: "You have %{new_messages} and %{old_messages}" messages: "You have %{new_messages} and %{old_messages}"
new_messages: new_messages:
one: "%{count} new message" one: "%{count} new message"
@ -1552,9 +1552,8 @@ en:
body: "Sorry there is no message with that id." body: "Sorry there is no message with that id."
outbox: outbox:
title: "Outbox" title: "Outbox"
my_inbox_html: "My %{inbox_link}" my_inbox: "My Inbox"
inbox: "inbox" my_outbox: "My Outbox"
outbox: "outbox"
messages: messages:
one: "You have %{count} sent message" one: "You have %{count} sent message"
other: "You have %{count} sent messages" other: "You have %{count} sent messages"