diff --git a/app/models/add_friend.rb b/app/models/add_friend.rb index 543d808..6b0e529 100644 --- a/app/models/add_friend.rb +++ b/app/models/add_friend.rb @@ -18,7 +18,7 @@ class AddFriend < Task end def description - _('%s wants to be your friend') % requestor.name + _('%s wants to be your friend.') % requestor.name end def permission @@ -27,7 +27,7 @@ class AddFriend < Task def target_notification_message description + "\n\n" + - _('You need login to accept this.') + _('You need to login to %{system} in order to accept %{requestor} as your friend. You can use the address below to do that.') % { :system => target.environment.name, :requestor => requestor.name } end end diff --git a/app/models/add_member.rb b/app/models/add_member.rb index e9c52a4..c2f03d5 100644 --- a/app/models/add_member.rb +++ b/app/models/add_member.rb @@ -5,12 +5,8 @@ class AddMember < Task alias :person :requestor alias :person= :requestor= - alias :community :target - alias :community= :target= alias :organization :target alias :organization= :target= - alias :enterprise :target - alias :enterprise= :target= acts_as_having_settings :roles, :field => :data @@ -20,7 +16,7 @@ class AddMember < Task end def description - _('%s wants to be a member') % requestor.name + _('%s wants to be a member of "%s".') % [requestor.name, organization.name] end def permission @@ -29,7 +25,7 @@ class AddMember < Task def target_notification_message description + "\n\n" + - _('You need login to accept this.') + _('You will need login to %{system} in order to accept or reject %{requestor} as a member of %{organization}.') % { :system => target.environment.name, :requestor => requestor.name, :organization => organization.name } end end diff --git a/app/models/task_mailer.rb b/app/models/task_mailer.rb index 0b2b29e..1d121e3 100644 --- a/app/models/task_mailer.rb +++ b/app/models/task_mailer.rb @@ -15,7 +15,7 @@ class TaskMailer < ActionMailer::Base recipients task.target.contact_email from self.class.generate_from(task) - subject _('%s - %s') % [task.requestor.environment.name, task.description] + subject '[%s] %s' % [task.requestor.environment.name, task.description] body :requestor => task.requestor.name, :target => task.target.name, :message => msg, @@ -39,7 +39,7 @@ class TaskMailer < ActionMailer::Base recipients task.requestor.email from self.class.generate_from(task) - subject task.description + subject '[%s] %s' % [task.requestor.environment.name, task.description] body :requestor => task.requestor.name, :message => text, :environment => task.requestor.environment.name, diff --git a/app/views/task_mailer/target_notification.rhtml b/app/views/task_mailer/target_notification.rhtml index f17ea3f..092f5e4 100644 --- a/app/views/task_mailer/target_notification.rhtml +++ b/app/views/task_mailer/target_notification.rhtml @@ -1,7 +1,7 @@ -<%= _('Dear %s,') % @target %> +<%= _('Hello %s,') % @target %> -<%= @message %> +<%= word_wrap(@message) %> -- -<%= _('%s environment system') % @environment %> +<%= @environment %> <%= @url %> -- libgit2 0.21.2