Merge branch 'master' into openstreetbugs

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

diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb
index 2a97b7bbd2d1f9d6ea782a61a646d7e4417b66da..bcd2da33a14abcf7bb560c6996ede6244de10fff 100644 (file)
--- a/app/views/message/inbox.html.erb
+++ b/app/views/message/inbox.html.erb
@@ -1,6 +1,6 @@
 <h2><%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), url_for(:controller => "user", :action => "outbox", :id => @user.display_name) %></h2>
 
-<p><%= t'message.inbox.you_have', :new_count => @user.new_messages.size, :old_count => (@user.messages.size -  @user.new_messages.size) %></p> 
+<%= render :partial => "message_count" %>
 
 <% if @user.messages.size > 0 %>
   <div id="messages">
@@ -17,5 +17,5 @@
     </table>
   </div>
 <% else %>
-  <div id="messages"><%= 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) %></div>
+  <div id="messages"><%= 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)) %></div>
 <% end %>