pulled and merged request 509, thanks siefca

app/helpers/requests_helper.rb

@@ -10,11 +10,7 @@ module RequestsHelper
 
   def new_request_link(request_count)
     if request_count > 0
-      if request_count > 1
+        link_to t('new_requests', :count => @request_count), aspects_manage_path
-        link_to t('.new_requests', :count => @request_count), aspects_manage_path
-      else
-        link_to t('.new_request', :count => @request_count), aspects_manage_path
-      end
     end
   end
 

app/views/aspects/show.html.haml

@@ -7,15 +7,9 @@
     = @aspect
 
   %span.aspect_contact_count{:style=>"color:#999;font-size:14px;"}
-    = @aspect.contacts.count
+    = t('contacts', :count=>@aspect_contacts.count)
-    - if @aspect.contacts.count == 1
-      = t('.contact')
-    - else
-      = t('.contacts')
-
     = link_to t('.edit_aspect'), "#", :id => "edit_aspect_trigger"
 
-
 .span-8.append-1
   = render 'shared/aspect_contacts', :contacts => @aspect_contacts, :aspect => @aspect
 

app/views/shared/_aspect_contacts.haml

@@ -79,7 +79,7 @@
             %h4
               = link_to user_aspect, user_aspect
               %span
-                = "#{user_aspect.contacts.count} #{t('.contacts')}"
+                = t('contacts', :count=>user_aspect.contacts.count)
 
             - if user_aspect.contacts.count > 0 
               - for aspect_contact in user_aspect.contacts[0..7]

config/locales/diaspora/en.yml

@@ -28,7 +28,17 @@ en:
   search: "Search"
   _home: "Home"
   _comments: "Comments"
-  
+  contacts:
+    zero:   "no contacts"
+    one:    "1 contact"
+    few:    "%{count} contacts"
+    other:  "%{count} contacts"
+  new_requests:
+    zero:   "no new requests"
+    one:    "new request!"
+    few:    "%{count} new requests!"
+    other:  "%{count} new requests!"
+
   activemodel:
       errors:
           models:
@@ -81,9 +91,10 @@ en:
       aspect_contacts:
           add_to: "add to %{aspect}"
           done_editing: "done editing"
-          new_requests: "%{count} new requests!"
+          add_existing: "Add an existing contact"
-          new_request: "%{count} new request!"
+          aspect_settings: "Aspect settings"
-          contacts: "contacts"
+          remove_aspect: "Remove Aspect"
+          confirm_remove_aspect: "Remove aspect?"
           no_contacts: "You currently have no contacts.  Find your contacts here."
           aspects: "Aspects"
           add_aspect: "add aspect"
@@ -114,8 +125,6 @@ en:
   aspects:
       show:
           edit_aspect: "edit aspect"
-          contact: "contact"
-          contacts: "contacts"
       no_contacts_message:
           nobody: "Bring the people that matter in your life to Diaspora!"
           nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."