cleanup broken html for new message count, add pluralized version

app/views/layouts/application.html.erb

@@ -84,8 +84,8 @@
         <% if @user %>
           <% if (count = @user.unread_message_count) > 0 %>
             <a href="/messages" class="new_messages <%= @cur_url == "/messages" ?
-              "cur_url" : "" %>"><%= count %><%= t('.newmessagelink')%><<%=
-              count == 1 ? "" : "s" %></a>
+              "cur_url" : "" %>"><%= t(".newmessagelink", :count => count)
+              %></a>
           <% else %>
             <a href="/messages" <%= @cur_url == "/messages" ?
               raw("class=\"cur_url\"") : "" %>><%= t('.messageslink') %></a>

config/locales/en.yml

@@ -11,7 +11,9 @@ en:
       submitstorylink: "Submit Story"
       searchlink: "Search"
       filterslink: "Filters"
-      newmessagelink: "New Message"
+      newmessagelink:
+        one: "1 New Message"
+        other: "%{count} New Messages"
       messageslink: "Messages"
       loginlink: "Login"
       logoutlink: "Logout"

config/locales/fr.yml

@@ -12,6 +12,8 @@ fr:
       searchlink: "Recherche"
       filterslink: "Filtres"
       newmessagelink: "Nouveau message"
+        one: "Nouveau message"
+        other: "%{count} Nouveau message"
       messageslink: "Messages"
       loginlink: "Se connecter"
       logoutlink: "Se déconnecter"