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

[rails.git] / app / views / messages / outbox.html.erb

diff --git a/app/views/messages/outbox.html.erb b/app/views/messages/outbox.html.erb
index 65fbaf3261c818aa79613e6b6a3c6b546b69a9b3..5cb357f6fa19c899e88eb4970ca7caeb0844816e 100644 (file)
--- a/app/views/messages/outbox.html.erb
+++ b/app/views/messages/outbox.html.erb
@@ -4,10 +4,10 @@
 
 <%= render :partial => "heading", :locals => { :active_link_path => outbox_messages_path } %>
 
 
 <%= render :partial => "heading", :locals => { :active_link_path => outbox_messages_path } %>
 

-<%= render :partial => "outbox_count" %>
+<h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>

 
 <% if current_user.sent_messages.size > 0 %>
   <%= render :partial => "messages_table", :locals => { :columns => %w[to subject date], :messages => current_user.sent_messages, :inner_partial => "sent_message_summary" } %>
 <% else %>
 
 <% if current_user.sent_messages.size > 0 %>
   <%= render :partial => "messages_table", :locals => { :columns => %w[to subject date], :messages => current_user.sent_messages, :inner_partial => "sent_message_summary" } %>
 <% else %>

-  <div class="messages"><%= t(".no_sent_messages_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %></div>
+  <div class="messages"><%= t(".no_sent_messages_html", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), dashboard_path)) %></div>

 <% end %>
 <% end %>