X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/502dc65e95593287647c426e733efa06750dd322..57787edc20fceec0c199e1b795f3394424d4cca1:/app/views/message/inbox.html.erb?ds=sidebyside
diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb
index e75d6c1ec..0cbc7c77c 100644
--- a/app/views/message/inbox.html.erb
+++ b/app/views/message/inbox.html.erb
@@ -1,6 +1,6 @@
-
<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), url_for(:controller => "user", :action => "outbox", :id => @user.display_name) %>
+<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %>
-<%= t'message.inbox.you_have', :new_count => @user.new_messages.size, :old_count => (@user.messages.size - @user.new_messages.size) %>
+<%= render :partial => "message_count" %>
<% if @user.messages.size > 0 %>
@@ -11,10 +11,11 @@
<%= t'message.inbox.date' %> |
|
|
+ |
<%= render :partial => "message_summary", :collection => @user.messages %>
<% else %>
- <%= t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name) %>
+ <%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
<% end %>