diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml index 64a44d115..4e5b3ec25 100644 --- a/app/views/aspects/_aspect_listings.haml +++ b/app/views/aspects/_aspect_listings.haml @@ -16,7 +16,7 @@ %li#sharers{:class => ("dull" if @contacts_sharing_with.size == 0)} .right %b - = link_to t('contacts', :count => @contacts_sharing_with.size), contacts_sharing_path, :rel => 'facebox', :class => 'contact-count' + = link_to t('contacts', :count => @contacts_sharing_with.size), sharing_contacts_path, :rel => 'facebox', :class => 'contact-count' %b = t('aspects.index.people_sharing_with_you') %br diff --git a/app/views/contacts/sharing.haml b/app/views/contacts/sharing.haml index 89f5c5d73..29c9dbaae 100644 --- a/app/views/contacts/sharing.haml +++ b/app/views/contacts/sharing.haml @@ -11,7 +11,7 @@ = t('contacts', :count =>@contacts.count) %h3#aspect_name_title - %span.name= "People sharing with you:" + %span.name= t('.people_sharing') - if @contacts.count > 0 .contact_list diff --git a/app/views/people/contacts.haml b/app/views/people/contacts.haml index eb0b26700..0c704398d 100644 --- a/app/views/people/contacts.haml +++ b/app/views/people/contacts.haml @@ -37,9 +37,9 @@ - else - if user_signed_in? && @contact.person && @contact.receiving? .right - = link_to t('.mention'), new_status_message_path(:person_id => @person.id), :class => 'button', :rel => 'facebox' + = link_to t('people.show.mention'), new_status_message_path(:person_id => @person.id), :class => 'button', :rel => 'facebox' - if @contact.mutual? - = link_to t('.message'), new_conversation_path(:contact_id => @contact.id, :name => @contact.person.name, :contact_id => @contact.id), :class => 'button', :rel => 'facebox' + = link_to t('people.show.message'), new_conversation_path(:contact_id => @contact.id, :name => @contact.person.name, :contact_id => @contact.id), :class => 'button', :rel => 'facebox' %h3 = @person.name diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index e6586ba2b..b11da4ab0 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -188,6 +188,8 @@ en: few: "In %{count} aspects" many: "In %{count} aspects" other: "In %{count} aspects" + sharing: + people_sharing: "People sharing with you:" conversations: index: diff --git a/config/routes.rb b/config/routes.rb index c195057af..799cf3d01 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -69,8 +69,9 @@ Diaspora::Application.routes.draw do resource :profile - get 'contacts/sharing' => 'contacts#sharing' - resources :contacts, :except => [:index, :update, :create] + resources :contacts, :except => [:index, :update, :create] do + get :sharing, :on => :collection + end resources :aspect_memberships, :only => [:destroy, :create, :update] resources :post_visibilities, :only => [:update]