Fix various routing and route generation errors

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

diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb
index afd1d2fc530b96d1624d3a1d855fff5f4a289e5b..ece51428975c881bf090f6af83c69dbc042f784a 100644 (file)
--- a/app/views/message/outbox.html.erb
+++ b/app/views/message/outbox.html.erb
@@ -1,6 +1,6 @@
-<h2><%= t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), url_for(:controller => "user", :action => "inbox", :id => @user.display_name)) %>/<%= t'message.outbox.outbox' %></h2>
+<h2><%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %></h2>

 
 

-<p><%= t'message.outbox.you_have_sent_messages', :count => @user.sent_messages.size %>
+<p><%= t'message.outbox.messages', :count => @user.sent_messages.size %>

 
 <% if @user.sent_messages.size > 0 %>
   <div id="messages">
 
 <% if @user.sent_messages.size > 0 %>
   <div id="messages">


@@ -15,5 +15,5 @@
     </table>
   </div>
 <% else %>
     </table>
   </div>
 <% else %>

-  <div id="messages"><%= t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name) %></div>
+  <div id="messages"><%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %></div>

 <% end %>
 <% end %>