# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1300971150 0
# Node ID ba87afa7660771f67e3855890af07cb4072a8f1e
# Parent  b133cb3ce3b19886f1b86a555e14393d0f0a58a3
fixed template variable problems; created subject label; fixed old labels

diff -r b133cb3ce3b1 -r ba87afa76607 app/models/mailer.rb
--- a/app/models/mailer.rb	Thu Mar 24 10:04:11 2011 +0000
+++ b/app/models/mailer.rb	Thu Mar 24 12:52:30 2011 +0000
@@ -43,10 +43,14 @@
 
     user = User.find(member.user_id)
 
+    logger.debug "ABRACADABRA"
+    logger.debug project.name
+
+
     set_language_if_valid user.language
     recipients user.mail
-    subject l(:mail_subject_register, Setting.app_title)
-    body :project_url => url_for(:controller => 'project', :action => 'view'),
+    subject l(:mail_subject_added_to_project, Setting.app_title)
+    body :project_url => url_for(:controller => 'projects', :action => 'show', :id => project.id),
         :project_name => project.name
     render_multipart('added_to_project', body)
   end
diff -r b133cb3ce3b1 -r ba87afa76607 app/views/mailer/added_to_project.text.html.rhtml
--- a/app/views/mailer/added_to_project.text.html.rhtml	Thu Mar 24 10:04:11 2011 +0000
+++ b/app/views/mailer/added_to_project.text.html.rhtml	Thu Mar 24 12:52:30 2011 +0000
@@ -1,2 +1,3 @@
 <p><%= l(:notice_added_to_project, :project_name => @project_name) %></p>
-<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
+<p><%= l(:notice_project_homepage, :project_url => @project_url) %></p>
+
diff -r b133cb3ce3b1 -r ba87afa76607 app/views/mailer/added_to_project.text.plain.rhtml
--- a/app/views/mailer/added_to_project.text.plain.rhtml	Thu Mar 24 10:04:11 2011 +0000
+++ b/app/views/mailer/added_to_project.text.plain.rhtml	Thu Mar 24 12:52:30 2011 +0000
@@ -1,2 +1,2 @@
-<%= l(:notice_added_to_project, @project_name) %>
-<%= l(:label_login) %>: <%= @project_url %>
+<%= l(:notice_added_to_project, :project_name => @project_name) %>
+<%= l(:notice_project_homepage, :project_url => @project_url)  %>
diff -r b133cb3ce3b1 -r ba87afa76607 config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Thu Mar 24 10:04:11 2011 +0000
+++ b/config/locales/en-GB.yml	Thu Mar 24 12:52:30 2011 +0000
@@ -972,4 +972,7 @@
   label_reporter_description: Can submit bug reports; has read access for private projects
 
   label_set_role_plural: Choose roles for new member
-  notice_added_to_project: "You have been added to the project %{project_name}."
\ No newline at end of file
+  notice_added_to_project: 'You have been added to the project "{{project_name}}".'
+  notice_project_homepage: "You can visit the project using the following link: {{project_url}}"
+  mail_subject_added_to_project: "You've been added to a project on {{value}}"
+  
\ No newline at end of file
diff -r b133cb3ce3b1 -r ba87afa76607 config/locales/en.yml
--- a/config/locales/en.yml	Thu Mar 24 10:04:11 2011 +0000
+++ b/config/locales/en.yml	Thu Mar 24 12:52:30 2011 +0000
@@ -965,5 +965,6 @@
   label_reporter_description: Can submit bug reports; has read access for private projects
 
   label_set_role_plural: Choose roles for new member
-  notice_added_to_project: "You have been added to the project %{project_name}."  
-
+  notice_added_to_project: 'You have been added to the project "{{project_name}}".'
+  notice_project_homepage: "You can visit the project using the following link: {{project_url}}"
+  mail_subject_added_to_project: "You've been added to a project on {{value}}"