More elaborate notifications when adding a user to a team or as committer

3 files changed, 31 insertions, 2 deletions

diff --git a/app/models/committership.rb b/app/models/committership.rb
index 8cebc03..637a9e2 100644
--- a/app/models/committership.rb
+++ b/app/models/committership.rb
@@ -57,7 +57,18 @@ class Committership < ActiveRecord::Base
       return unless creator
       recipients = repository.owners
       recipients.each do |r|
-        message = Message.new(:sender => creator, :recipient => r, :subject => "A new committer has been added", :body => "The more, the merrier", :notifiable => self)
+        message = Message.new({
+          :sender => creator,
+          :recipient => r,
+          :subject => I18n.t("committership.notification_subject"),
+          :body => I18n.t("committership.notification_body", {
+            :inviter => creator.title,
+            :user => committer.title,
+            :repository => repository.name,
+            :project => repository.project.title
+          }),
+          :notifiable => self
+        })
         message.save
       end
     end
diff --git a/app/models/membership.rb b/app/models/membership.rb
index 53dcac4..e8d5807 100644
--- a/app/models/membership.rb
+++ b/app/models/membership.rb
@@ -49,7 +49,17 @@ class Membership < ActiveRecord::Base
     end
     
     def send_notification
-      message = Message.new(:sender => inviter, :recipient => user, :subject => "You have been added to a team", :body => "Welcome", :notifiable => self)
+      message = Message.new({
+        :sender => inviter,
+        :recipient => user,
+        :subject => I18n.t("membership.notification_subject"),
+        :body => I18n.t("membership.notification_body", {
+          :inviter => inviter.title,
+          :group => group.title,
+          :role => role.admin? ? 'administrator' : 'member'
+        }),
+        :notifiable => self
+      })
       message.save      
     end
 end
diff --git a/config/locales/en.rb b/config/locales/en.rb
index cce3bb9..fca50b8 100644
--- a/config/locales/en.rb
+++ b/config/locales/en.rb
@@ -124,6 +124,14 @@
     :user => {
       :invalid_url => "Invalid url",
     },
+    :membership => {
+      :notification_subject => "You have been added to a team",
+      :notification_body => "{{inviter}} added you to the \"{{group}}\" team, as a {{role}}",
+    },
+    :committership => {
+      :notification_subject => "A new committer has been added",
+      :notification_body => "{{inviter}} added {{user}} as a committer to the {{repository}} in the {{project}} project",
+    },
     :views => {
       :layout => {
         :system_notice => "System notice",