fix untranslated string; fix two translations; don't mess routes.rb again

This commit is contained in:
MrZYX 2011-05-18 00:53:25 +02:00
parent 2953cc8497
commit c47c9ef069
5 changed files with 9 additions and 6 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -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]