Merge branch 'master' into openid

[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 3e6346c9ab90398ba5485ad1ac550d14f460d07a..afd1d2fc530b96d1624d3a1d855fff5f4a289e5b 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>
 
-<p><%= t'message.outbox.you_have_sent_messages', :sent_count => @user.sent_messages.size %>
+<p><%= t'message.outbox.you_have_sent_messages', :count => @user.sent_messages.size %>
 
 <% if @user.sent_messages.size > 0 %>
   <div id="messages">
@@ -9,10 +9,11 @@
         <th><%= t'message.outbox.to' %></th>
         <th><%= t'message.outbox.subject' %></th>
         <th><%= t'message.outbox.date' %></th>
+        <th></th>
       </tr>
       <%= render :partial => "sent_message_summary", :collection => @user.sent_messages %>
     </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"><%= 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 %>