jro_apps/redmine Commit - r864:bd434427e61e

Mailer:...

Jean-Philippe Lang -

r864:bd434427e61e

parent child

Context file:

r864:bd434427e61e

Expand all files

app/views/mailer/account_information.text.html.rhtml created 644 +11 0

@@ -0,0 +1,11
	1	<% if @user.auth_source %>
	2	<p><%= l(:mail_body_account_information_external, @user.auth_source.name) %></p>
	3	<% else %>
	4	<p><%= l(:mail_body_account_information) %>:</p>
	5	<ul>
	6	<li><%= l(:field_login) %>: <%= @user.login %></li>
	7	<li><%= l(:field_password) %>: <%= @password %></li>
	8	</ul>
	9	<% end %>
	10
	11	<p><%= l(:label_login) %>: <%= auto_link(@login_url) %></p>

app/views/mailer/account_information.text.plain.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %>
	2	<% else %><%= l(:mail_body_account_information) %>:
	3	* <%= l(:field_login) %>: <%= @user.login %>
	4	* <%= l(:field_password) %>: <%= @password %>
	5	<% end %>
	6	<%= l(:label_login) %>: <%= @login_url %>

app/views/mailer/layout.text.html.rhtml created 644 +17 0

@@ -0,0 +1,17
	1	<html>
	2	<head>
	3	<style>
	4	body { font-family: Verdana, sans-serif; font-size: 0.8em; color:#484848; }
	5	body h1 { font-family: "Trebuchet MS", Verdana, sans-serif; font-size: 1.2em; margin: 0;}
	6	a, a:link, a:visited{ color: #2A5685; }
	7	a:hover, a:active{ color: #c61a1a; }
	8	hr { width: 100%; height: 1px; background: #ccc; border: 0; }
	9	.footer { font-size: 0.8em; font-style: italic; }
	10	</style>
	11	</head>
	12	<body>
	13	<%= yield %>
	14	<hr />
	15	<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.emails_footer) %></span>
	16	</body>
	17	</html>

app/views/mailer/lost_password.text.html.rhtml created 644 +2 0

@@ -0,0 +1,2
	1	<p><%= l(:mail_body_lost_password) %><br />
	2	<%= auto_link(@url) %></p>

app/views/mailer/lost_password.text.plain.rhtml created 644 +2 0

@@ -0,0 +1,2
	1	<%= l(:mail_body_lost_password) %>
	2	<%= @url %>

app/views/mailer/register.text.html.rhtml created 644 +2 0

@@ -0,0 +1,2
	1	<p><%= l(:mail_body_register) %><br />
	2	<%= auto_link(@url) %></p>

app/views/mailer/register.text.plain.rhtml created 644 +2 0

@@ -0,0 +1,2
	1	<%= l(:mail_body_register) %>
	2	<%= @url %>

app/models/mailer.rb +73 -61

@@ -20,99 +20,111 class Mailer < ActionMailer::Base
20	helper IssuesHelper	20	helper IssuesHelper
21	helper CustomFieldsHelper	21	helper CustomFieldsHelper
22		22
23	def account_information(user, password)	23	include ActionController::UrlWriter
24	set_language_if_valid user.language	24
25	recipients user.mail	25	def issue_add(issue)
26	from Setting.mail_from	26	recipients issue.recipients
27	subject l(:mail_subject_register)	27	subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
28	body :user => user, :password => password	28	body :issue => issue,
29	end	29	:issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
30
31	def issue_add(issue)
32	set_language_if_valid(Setting.default_language)
33	@recipients = issue.recipients
34	@from = Setting.mail_from
35	@subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
36	@body['issue'] = issue
37	end	30	end
38		31
39	def issue_edit(journal)	32	def issue_edit(journal)
40	set_language_if_valid(Setting.default_language)
41	issue = journal.journalized	33	issue = journal.journalized
42	@recipients = issue.recipients	34	recipients issue.recipients
43	# Watchers in cc	35	# Watchers in cc
44	~~@cc~~ = issue.watcher_recipients - @recipients	36	cc(issue.watcher_recipients - @recipients)
45	@from = Setting.mail_from	37	subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
46	@subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"	38	body :issue => issue,
47	@body['issue'] = issue	39	:journal => journal,
48	@body['journal']= journal	40	:issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
49	end	41	end
50		42
51	def document_added(document)	43	def document_added(document)
52	set_language_if_valid(Setting.default_language)	44	recipients document.project.recipients
53	@recipients = document.project.recipients	45	subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
54	@from = Setting.mail_from	46	body :document => document,
55	@subject = "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"	47	:document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
56	@body['document'] = document
57	end	48	end
58		49
59	def attachments_added(attachments)	50	def attachments_added(attachments)
60	set_language_if_valid(Setting.default_language)
61	container = attachments.first.container	51	container = attachments.first.container
62	url = ''
63	added_to = ''	52	added_to = ''
		53	added_to_url = ''
64	case container.class.name	54	case container.class.name
65	when 'Version'	55	when 'Version'
66	url = {~~:only_path~~ => ~~false~~, ~~:host~~ => ~~Setting~~.~~host_name~~, :controller => 'projects', :action => 'list_files', :id => container.project_id}	56	added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
67	added_to = "#{l(:label_version)}: #{container.name}"	57	added_to = "#{l(:label_version)}: #{container.name}"
68	when 'Document'	58	when 'Document'
69	url = {~~:only_path~~ => ~~false~~, ~~:host~~ => ~~Setting~~.~~host_name~~, :controller => 'documents', :action => 'show', :id => container.id}	59	added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
70	added_to = "#{l(:label_document)}: #{container.title}"	60	added_to = "#{l(:label_document)}: #{container.title}"
71	end	61	end
72	@recipients = container.project.recipients	62	recipients container.project.recipients
73	@from = Setting.mail_from	63	subject "[#{container.project.name}] #{l(:label_attachment_new)}"
74	@subject = "[#{container.project.name}] #{l(:label_attachment_new)}"	64	body :attachments => attachments,
75	@body['attachments'] = attachments	65	:added_to => added_to,
76	@body['url'] = url	66	:added_to_url => added_to_url
77	@body['added_to'] = added_to
78	end	67	end
79		68
80	def news_added(news)	69	def news_added(news)
81	set_language_if_valid(Setting.default_language)	70	recipients news.project.recipients
82	@recipients = news.project.recipients	71	subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
83	@from = Setting.mail_from	72	body :news => news,
84	@subject = "[#{news.project.name}] #{l(:label_news)}: #{news.title}"	73	:news_url => url_for(:controller => 'news', :action => 'show', :id => news)
85	@body['news'] = news
86	end	74	end
87		75
		76	def message_posted(message, recipients)
		77	recipients(recipients)
		78	subject "[#{message.board.project.name} - #{message.board.name}] #{message.subject}"
		79	body :message => message,
		80	:message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
		81	end
		82
		83	def account_information(user, password)
		84	set_language_if_valid user.language
		85	recipients user.mail
		86	subject l(:mail_subject_register)
		87	body :user => user,
		88	:password => password,
		89	:login_url => url_for(:controller => 'account', :action => 'login')
		90	end
		91
88	def lost_password(token)	92	def lost_password(token)
89	set_language_if_valid(token.user.language)	93	set_language_if_valid(token.user.language)
90	@recipients = token.user.mail	94	recipients token.user.mail
91	@from = Setting.mail_from	95	subject l(:mail_subject_lost_password)
92	@subject = l(:mail_subject_lost_password)	96	body :token => token,
93	@body['token'] = token	97	:url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
94	end	98	end
95		99
96	def register(token)	100	def register(token)
97	set_language_if_valid(token.user.language)	101	set_language_if_valid(token.user.language)
98	@recipients = token.user.mail	102	recipients token.user.mail
99	@from = Setting.mail_from	103	subject l(:mail_subject_register)
100	@subject = l(:mail_subject_register)	104	body :token => token,
101	@body['token'] = token	105	:url => url_for(:controller => 'account', :action => 'register', :token => token.value)
102	end
103
104	def message_posted(message, recipients)
105	set_language_if_valid(Setting.default_language)
106	@recipients = recipients
107	@from = Setting.mail_from
108	@subject = "[#{message.board.project.name} - #{message.board.name}] #{message.subject}"
109	@body['message'] = message
110	end	106	end
111		107
112	def test(user)	108	def test(user)
113	set_language_if_valid(user.language)	109	set_language_if_valid(user.language)
114	@recipients = user.mail	110	recipients user.mail
115	@from = Setting.mail_from	111	subject 'Redmine test'
116	@subject = 'Redmine'	112	body :url => url_for(:controller => 'welcome')
		113	end
		114
		115	private
		116	def initialize_defaults(method_name)
		117	super
		118	set_language_if_valid Setting.default_language
		119	from Setting.mail_from
		120	default_url_options[:host] = Setting.host_name
		121	default_url_options[:protocol] = Setting.protocol
		122	end
		123
		124	# Renders a message with the corresponding layout
		125	def render_message(method_name, body)
		126	layout = method_name.match(%r{text\.html\.(rhtml\|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
		127	body[:content_for_layout] = render(:file => method_name, :body => body)
		128	ActionView::Base.new(File.join(template_root, 'mailer'), body, self).render(:file => layout)
117	end	129	end
118	end	130	end

app/views/mailer/_issue_text_html.rhtml +1 -2

-            <%= link_to "#{issue.tracker.name} ##{issue.id}",  :only_path => false, :host => Setting.host_name, :controller => 'issues', :action => 'show', :id => issue %>:
+            <h1><%= link_to "#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url %></h1>
-            <%= issue.subject %>
             <ul>
             <li><%=l(:field_author)%>: <%= issue.author %></li>

app/views/mailer/_issue_text_plain.rhtml +1 -1

             <%= "#{issue.tracker.name} ##{issue.id}: #{issue.subject}" %>
-            <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'issues', :action => 'show', :id => issue %>
+            <%= issue_url %>
             <%=l(:field_author)%>: <%= issue.author %>
             <%=l(:field_status)%>: <%= issue.status %>

app/views/mailer/attachments_added.text.html.rhtml +1 -3

-            <%= link_to @added_to, @url %><br />
+            <%= link_to @added_to, @added_to_url %><br />
             <ul><% @attachments.each do |attachment | %>
             <li><%= attachment.filename %></li>
             <% end %></ul>
-            <hr />
-            <small><em><%= textilizable Setting.emails_footer %></em></small>

app/views/mailer/attachments_added.text.plain.rhtml +1 -3

             <%= @added_to %><% @attachments.each do |attachment | %>
             - <%= attachment.filename %><% end %>
-            <%= url_for @url %>
+            <%= @added_to_url %>
-            ----------------------------------------
-            <%= Setting.emails_footer %>

app/views/mailer/document_added.text.html.rhtml +1 -4

@@ -1,6 +1,3
1	<%= link_to @document.title, :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %>	1	<%= link_to @document.title, @document_url %> (<%= @document.category.name %>)<br />
2	(<%= @document.category.name %>)<br />
3	<br />	2	<br />
4	<%= textilizable(@document.description) %>	3	<%= textilizable(@document.description) %>
5	<hr />
6	<small><em><%= textilizable Setting.emails_footer %></em></small>

app/views/mailer/document_added.text.plain.rhtml +1 -3

             <%= @document.title %> (<%= @document.category.name %>)
-            <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %>
+            <%= @document_url %>
             <%= @document.description %>
-            ----------------------------------------
-            <%= Setting.emails_footer %>

app/views/mailer/issue_add.text.html.rhtml +1 -3

@@ -1,5 +1,3
1	<%= l(:text_issue_added, "##{@issue.id}") %>	1	<%= l(:text_issue_added, "##{@issue.id}") %>
2	<hr />	2	<hr />
3	<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %>	3	<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %>
4	<hr />
5	<small><em><%= textilizable Setting.emails_footer %></em></small>

app/views/mailer/issue_add.text.plain.rhtml +1 -3

@@ -1,5 +1,3
1	<%= l(:text_issue_added, "##{@issue.id}") %>	1	<%= l(:text_issue_added, "##{@issue.id}") %>
2	----------------------------------------	2	----------------------------------------
3	<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %>	3	<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %>
4	----------------------------------------
5	<%= Setting.emails_footer %>

app/views/mailer/issue_edit.text.html.rhtml +1 -3

             </ul>
             <%= textilizable(@journal.notes) %>
             <hr />
-            <%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %>
+            <%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %>
-            <hr />
-            <small><em><%= textilizable Setting.emails_footer %></em></small>

app/views/mailer/issue_edit.text.plain.rhtml +1 -3

             <% end %>
             <%= @journal.notes if @journal.notes? %>
             ----------------------------------------
-            <%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %>
+            <%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %>
-            ----------------------------------------
-            <%= Setting.emails_footer %>

app/views/mailer/layout.text.plain.rhtml ~~app/views/mailer/lost_password.rhtml~~ renamed +1 -3

@@ -1,5 +1,3
1	<%= l(:mail_body_lost_password) %>	1	<%= yield %>
2	<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
3
4	----------------------------------------	2	----------------------------------------
5	<%= Setting.emails_footer %>	3	<%= Setting.emails_footer %>

app/views/mailer/message_posted.text.html.rhtml +1 -3

-            <%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to @message.subject, :only_path => false, :host => Setting.host_name, :controller => 'messages', :action => 'show', :board_id => @message.board_id, :id => @message.root %><br />
+            <h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to @message.subject, @message_url %></h1>
             <em><%= @message.author.name %></em>
             <%= textilizable @message.content %>
-            <hr />
-            <small><em><%= textilizable Setting.emails_footer %></em></small>

app/views/mailer/message_posted.text.plain.rhtml +1 -3

-            <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'messages', :action => 'show', :board_id => @message.board_id, :id => @message.root %>
+            <%= @message_url %>
             <%= @message.author.name %>
             <%= @message.content %>
-            ----------------------------------------
-            <%= Setting.emails_footer %>

app/views/mailer/news_added.text.html.rhtml +1 -3

-            <%= link_to @news.title, :only_path => false, :host => Setting.host_name, :controller => 'news', :action => 'show', :id => @news %><br />
+            <h1><%= link_to @news.title, @news_url %></h1>
             <em><%= @news.author.name %></em>
             <%= textilizable(@news.description) %>
-            <hr />
-            <small><em><%= textilizable Setting.emails_footer %></em></small>

app/views/mailer/news_added.text.plain.rhtml +1 -3

             <%= @news.title %>
-            <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'news', :action => 'show', :id => @news %>
+            <%= @news_url %>
             <%= @news.author.name %>
             <%= @news.description %>
-            ----------------------------------------
-            <%= Setting.emails_footer %>

app/views/mailer/test.text.html.rhtml +1 -4

@@ -1,5 +1,2
1	<p>This is a test email sent by Redmine.<br />	1	<p>This is a test email sent by Redmine.<br />
2	Redmine URL: <%= link_to url_for(:only_path => false, :host => Setting.host_name, :controller => 'welcome'),	2	Redmine URL: <%= auto_link(@url) %></p>
3	url_for(:only_path => false, :host => Setting.host_name, :controller => 'welcome') %></p>
4	<hr />
5	<small><em><%= textilizable Setting.emails_footer %></em></small>

app/views/mailer/test.text.plain.rhtml +1 -4

@@ -1,5 +1,2
1	This is a test email sent by Redmine.	1	This is a test email sent by Redmine.
2	Redmine URL: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'welcome' %>	2	Redmine URL: <%= @url %>
3
4	----------------------------------------
5	<%= Setting.emails_footer %>

app/views/settings/edit.rhtml +4 -1

             <p><label><%= l(:setting_host_name) %></label>
             <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
+            <p><label><%= l(:setting_protocol) %></label>
+            <%= select_tag 'settings[protocol]', options_for_select(['http', 'https'], Setting.protocol) %></p>
             <p><label><%= l(:setting_text_formatting) %></label>
             <%= select_tag 'settings[text_formatting]', options_for_select([[l(:label_none), "0"], ["textile", "textile"]], Setting.text_formatting) %></p>
             <%= submit_tag l(:button_save) %>
             </div>
-            <% end %>
  No newline at end of file
+            <% end %>

config/settings.yml +2 0

               default: en
             host_name:
               default: localhost:3000
+            protocol:
+              default: http
             feeds_limit:
               format: int
               default: 15

lang/bg.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/cs.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/de.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/en.yml +3 0

             mail_body_lost_password: 'To change your Redmine password, click on the following link:'
             mail_subject_register: Redmine account activation
             mail_body_register: 'To activate your Redmine account, click on the following link:'
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errors
             setting_issue_list_default_columns: Default columns displayed on the issue list
             setting_repositories_encodings: Repositories encodings
             setting_emails_footer: Emails footer
+            setting_protocol: Protocol
             label_user: User
             label_user_plural: Users

lang/es.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/fr.yml +3 0

             mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
             mail_subject_register: Activation de votre compte redMine
             mail_body_register: 'Pour activer votre compte Redmine, cliquez sur le lien suivant:'
+            mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" pour vous connecter à Redmine.
+            mail_body_account_information: Paramètres de connexion de votre compte Redmine
             gui_validation_error: 1 erreur
             gui_validation_error_plural: %d erreurs
             setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes
             setting_repositories_encodings: Encodages des dépôts
             setting_emails_footer: Pied-de-page des emails
+            setting_protocol: Protocole
             label_user: Utilisateur
             label_user_plural: Utilisateurs

lang/he.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/it.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/ja.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/nl.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/pl.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: Możesz użyć twojego "%s" konta do zalogowania do Redmine.
+            mail_body_account_information: Twoje konto w Redmine
+            setting_protocol: Protocol

lang/pt-br.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/pt.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/ro.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/sr.yml +3 0

             mail_body_lost_password: 'Da biste izmenili vašu Redmine lozinku, kliknite na sledeći link:'
             mail_subject_register: aktivacija redMine naloga
             mail_body_register: 'Da biste aktivirali vaš Redmine nalog, kliknite na sledeći link:'
+            mail_body_account_information_external: Mozete koristiti vas "%s" nalog da bi ste se prikljucili na Redmine.
+            mail_body_account_information: Informacije o vasem Redmine nalogu
             gui_validation_error: 1 greška
             gui_validation_error_plural: %d grešaka
             enumeration_activities: Aktivnosti (praćenje vremena))
             label_float: Float
             button_copy: Copy
+            setting_protocol: Protocol

lang/sv.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

lang/zh.yml +3 0

             setting_emails_footer: Emails footer
             label_float: Float
             button_copy: Copy
+            mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+            mail_body_account_information: Your Redmine account information
+            setting_protocol: Protocol

test/fixtures/attachments.yml +13 0

@@ -11,3 +11,16 attachments_001:
11	filesize: 28	11	filesize: 28
12	filename: error281.txt	12	filename: error281.txt
13	author_id: 2	13	author_id: 2
		14	attachments_002:
		15	created_on: 2006-07-19 21:07:27 +02:00
		16	downloads: 0
		17	content_type: text/plain
		18	disk_filename: 060719210727_document.txt
		19	container_id: 1
		20	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
		21	id: 2
		22	container_type: Document
		23	filesize: 28
		24	filename: document.txt
		25	author_id: 2
		26	No newline at end of file

test/unit/mailer_test.rb +40 -3

             require File.dirname(__FILE__) + '/../test_helper'
             class MailerTest < Test::Unit::TestCase
-              fixtures :projects, :issues, :users, :members, :documents, :attachments, :tokens, :journals, :journal_details, :trackers, :issue_statuses, :enumerations
+              fixtures :projects, :issues, :users, :members, :documents, :attachments, :news, :tokens, :journals, :journal_details, :trackers, :issue_statuses, :enumerations
               # test mailer methods for each language
               def test_issue_add
                 end
               end
-              def test_document_add
+              def test_document_added
                 document = Document.find(1)
                 GLoc.valid_languages.each do |lang|
                   Setting.default_language = lang.to_s
                   assert Mailer.deliver_document_added(document)
                 end
               end
+              def test_attachments_added
+                attachements = [ Attachment.find_by_container_type('Document') ]
+                GLoc.valid_languages.each do |lang|
+                  Setting.default_language = lang.to_s
+                  assert Mailer.deliver_attachments_added(attachements)
+                end
+              end
+              def test_news_added
+                news = News.find(:first)
+                GLoc.valid_languages.each do |lang|
+                  Setting.default_language = lang.to_s
+                  assert Mailer.deliver_news_added(news)
+                end
+              end
+              def test_message_posted
+                message = Message.find(:first)
+                recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}
+                recipients = recipients.compact.uniq
+                GLoc.valid_languages.each do |lang|
+                  Setting.default_language = lang.to_s
+                  assert Mailer.deliver_message_posted(message, recipients)
+                end
+              end
+              def test_account_information
+                user = User.find(:first)
+                GLoc.valid_languages.each do |lang|
+                  user.update_attribute :language, lang.to_s
+                  user.reload
+                  assert Mailer.deliver_account_information(user, 'pAsswORd')
+                end
+              end
               def test_lost_password
                 token = Token.find(2)
                 GLoc.valid_languages.each do |lang|
                   token.user.update_attribute :language, lang.to_s
+                  token.reload
                   assert Mailer.deliver_lost_password(token)
                 end
               end
                 token = Token.find(1)
                 GLoc.valid_languages.each do |lang|
                   token.user.update_attribute :language, lang.to_s
+                  token.reload
                   assert Mailer.deliver_register(token)
                 end
               end
-            end
  No newline at end of file
+            end

app/views/mailer/account_information.rhtml removed 0 -12

NO CONTENT: file was removed

app/views/mailer/account_information_fr.rhtml removed 0 -12

NO CONTENT: file was removed

app/views/mailer/account_information_pl.rhtml removed 0 -12

NO CONTENT: file was removed

app/views/mailer/account_information_sr.rhtml removed 0 -9

NO CONTENT: file was removed

app/views/mailer/register.rhtml removed 0 -5

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages