diff --git a/app/models/invitation.rb b/app/models/invitation.rb index f6be288..26a0490 100644 --- a/app/models/invitation.rb +++ b/app/models/invitation.rb @@ -20,7 +20,7 @@ class Invitation < Task before_create do |task| if task.message && !task.message.match(//) - task.message += task.message_to_accept_invitation + task.message += Invitation.default_message_to_accept_invitation end end @@ -122,7 +122,7 @@ class Invitation < Task raise 'You should implement mail_template in a subclass' end - def message_to_accept_invitation - '

' + _('To accept invitation, please follow this link: ') + '

' + def self.default_message_to_accept_invitation + "\n\n" + _('To accept invitation, please follow this link: ') end end diff --git a/test/unit/invitation_test.rb b/test/unit/invitation_test.rb index 9e3f9a7..1a8d224 100644 --- a/test/unit/invitation_test.rb +++ b/test/unit/invitation_test.rb @@ -80,7 +80,7 @@ class InvitationTest < ActiveSupport::TestCase :friend => friend, :message => 'Hi , is inviting you!' ) - assert_equal "Hi , is inviting you!#{invitation.message_to_accept_invitation}", invitation.message + assert_equal "Hi , is inviting you!#{Invitation.default_message_to_accept_invitation}", invitation.message end should 'do nothing with message if user added url' do @@ -95,6 +95,6 @@ class InvitationTest < ActiveSupport::TestCase end should 'have a message with url' do - assert_equal "

To accept invitation, please follow this link:

", Invitation.new.message_to_accept_invitation + assert_equal "\n\nTo accept invitation, please follow this link: ", Invitation.default_message_to_accept_invitation end end -- libgit2 0.21.2