diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 76bac07b7..4ccc208b8 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -445,9 +445,9 @@ en: few: "%{count} friends" other: "%{count} friends" not_connected: "not connected" - remote_friend: - resend: "resend" - invite: "invite" + remote_friend: + resend: "resend" + invite: "invite" notifier: hello: "Hello %{name}!" love: "love," diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb index a6edf97f3..b02c35adc 100644 --- a/spec/controllers/services_controller_spec.rb +++ b/spec/controllers/services_controller_spec.rb @@ -86,12 +86,19 @@ describe ServicesController do @service1 = Services::Facebook.new @user.services << @service1 @person = Factory(:person) + @user.services.stub!(:where).and_return([@service1]) + @hash = {"facebook_id" => {:contact => @user.contact_for(bob.person), :name => "Robert Bobson", :person => bob.person}, + "facebook_id2" => {:name => "Robert Bobson2"}} + @service1.should_receive(:finder).and_return(@hash) end it 'calls the finder method for the service for that user' do - @user.services.stub!(:where).and_return([@service1]) - @service1.should_receive(:finder).and_return("facebook_id" => {:contact => @user.contact_for(bob.person), :name => "Robert Bobson", :person => bob.person}) get :finder, :provider => @service1.provider + response.should be_success + end + it 'has no translations missing' do + get :finder, :provider => @service1.provider + response.body.match(/translation/).should be_nil end end