diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml index 1aad5e0b8..c6cec0c6c 100644 --- a/config/locales/devise/devise.en.yml +++ b/config/locales/devise/devise.en.yml @@ -64,12 +64,13 @@ en: unlock: "Unlock my account" invitation: subject: "You've been invited to join Diaspora!" - has_invited_you: "%{name} has invited you to join Diaspora" - have_invited_you: "%{names} have invited you to join Diaspora" - accept_at: ", at %{url}, you can accept it through the link below." accept: "Accept invitation" ignore: "If you don't want to accept the invitation, please ignore this email." no_account_till: "Your account won't be created until you access the link above and sign up." + inviters: + has_invited_you: "%{name} has invited you to join Diaspora" + have_invited_you: "%{names} have invited you to join Diaspora" + accept_at: ", at %{url}, you can accept it through the link below." shared: links: sign_in: 'Sign in' diff --git a/spec/models/invitation_spec.rb b/spec/models/invitation_spec.rb index 9a273e0f4..d83e4e173 100644 --- a/spec/models/invitation_spec.rb +++ b/spec/models/invitation_spec.rb @@ -102,6 +102,11 @@ describe Invitation do new_user = Invitation.create_invitee(:from => user, :email => @email, :into => aspect, :message => message) Devise.mailer.deliveries.first.to_s.include?(message).should be_true end + it 'has no translation missing' do + message = "How've you been?" + new_user = Invitation.create_invitee(:from => user, :email => @email, :into => aspect, :message => message) + Devise.mailer.deliveries.first.body.raw_source.match(/(translation_missing.+)/).should be_nil + end end context 'with no inviter' do it 'sends an email that includes the right things' do