Rails3: mail: rename app/views/mailer/*.text.plain.rhtml to app/views/mailer/*.text...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7536 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index f62e24d5129e942d4e3a805054f8aba68ec21862..591f4e97c197d4f5c9d8eccec385e3d4b4b5f815 100644 (file)
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -420,13 +420,13 @@ class Mailer < ActionMailer::Base
   def render_multipart(method_name, body)
     if Setting.plain_text_mail?
       content_type "text/plain"
-      body render(:file => "#{method_name}.text.plain.rhtml",
+      body render(:file => "#{method_name}.text.erb",
                   :body => body,
                   :layout => 'mailer.text.erb')
     else
       content_type "multipart/alternative"
       part :content_type => "text/plain",
-           :body => render(:file => "#{method_name}.text.plain.rhtml",
+           :body => render(:file => "#{method_name}.text.erb",
                            :body => body, :layout => 'mailer.text.erb')
       part :content_type => "text/html",
            :body => render_message("#{method_name}.text.html.rhtml", body)

diff --git a/app/views/mailer/account_activated.text.erb b/app/views/mailer/account_activated.text.erb
new file mode 100644 (file)
index 0000000..4dac4fb
--- /dev/null
+++ b/app/views/mailer/account_activated.text.erb
@@ -0,0 +1,2 @@
+<%= l(:notice_account_activated) %>
+<%= l(:label_login) %>: <%= @login_url %>

diff --git a/app/views/mailer/account_activated.text.plain.rhtml b/app/views/mailer/account_activated.text.plain.rhtml
deleted file mode 100644 (file)
index 4dac4fb..0000000
--- a/app/views/mailer/account_activated.text.plain.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= l(:notice_account_activated) %>
-<%= l(:label_login) %>: <%= @login_url %>

diff --git a/app/views/mailer/account_activation_request.text.erb b/app/views/mailer/account_activation_request.text.erb
new file mode 100644 (file)
index 0000000..f431e22
--- /dev/null
+++ b/app/views/mailer/account_activation_request.text.erb
@@ -0,0 +1,2 @@
+<%= l(:mail_body_account_activation_request, @user.login) %>
+<%= @url %>

diff --git a/app/views/mailer/account_activation_request.text.plain.rhtml b/app/views/mailer/account_activation_request.text.plain.rhtml
deleted file mode 100644 (file)
index f431e22..0000000
--- a/app/views/mailer/account_activation_request.text.plain.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= l(:mail_body_account_activation_request, @user.login) %>
-<%= @url %>

diff --git a/app/views/mailer/account_information.text.erb b/app/views/mailer/account_information.text.erb
new file mode 100644 (file)
index 0000000..0a02566
--- /dev/null
+++ b/app/views/mailer/account_information.text.erb
@@ -0,0 +1,6 @@
+<% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %>
+<% else %><%= l(:mail_body_account_information) %>:
+* <%= l(:field_login) %>: <%= @user.login %>
+* <%= l(:field_password) %>: <%= @password %>
+<% end %>
+<%= l(:label_login) %>: <%= @login_url %>

diff --git a/app/views/mailer/account_information.text.plain.rhtml b/app/views/mailer/account_information.text.plain.rhtml
deleted file mode 100644 (file)
index 0a02566..0000000
--- a/app/views/mailer/account_information.text.plain.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %>
-<% else %><%= l(:mail_body_account_information) %>:
-* <%= l(:field_login) %>: <%= @user.login %>
-* <%= l(:field_password) %>: <%= @password %>
-<% end %>
-<%= l(:label_login) %>: <%= @login_url %>

diff --git a/app/views/mailer/attachments_added.text.erb b/app/views/mailer/attachments_added.text.erb
new file mode 100644 (file)
index 0000000..28cb828
--- /dev/null
+++ b/app/views/mailer/attachments_added.text.erb
@@ -0,0 +1,4 @@
+<%= @added_to %><% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
+<%= @added_to_url %>

diff --git a/app/views/mailer/attachments_added.text.plain.rhtml b/app/views/mailer/attachments_added.text.plain.rhtml
deleted file mode 100644 (file)
index 28cb828..0000000
--- a/app/views/mailer/attachments_added.text.plain.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= @added_to %><% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
-<%= @added_to_url %>

diff --git a/app/views/mailer/document_added.text.erb b/app/views/mailer/document_added.text.erb
new file mode 100644 (file)
index 0000000..a6a7282
--- /dev/null
+++ b/app/views/mailer/document_added.text.erb
@@ -0,0 +1,4 @@
+<%= @document.title %> (<%= @document.category.name %>)
+<%= @document_url %>
+
+<%= @document.description %>

diff --git a/app/views/mailer/document_added.text.plain.rhtml b/app/views/mailer/document_added.text.plain.rhtml
deleted file mode 100644 (file)
index a6a7282..0000000
--- a/app/views/mailer/document_added.text.plain.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= @document.title %> (<%= @document.category.name %>)
-<%= @document_url %>
-
-<%= @document.description %>

diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
new file mode 100644 (file)
index 0000000..19c1dcf
--- /dev/null
+++ b/app/views/mailer/issue_add.text.erb
@@ -0,0 +1,4 @@
+<%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
+
+----------------------------------------
+<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/issue_add.text.plain.rhtml b/app/views/mailer/issue_add.text.plain.rhtml
deleted file mode 100644 (file)
index 19c1dcf..0000000
--- a/app/views/mailer/issue_add.text.plain.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
-
-----------------------------------------
-<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
new file mode 100644 (file)
index 0000000..870f8fa
--- /dev/null
+++ b/app/views/mailer/issue_edit.text.erb
@@ -0,0 +1,9 @@
+<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
+
+<% for detail in @journal.details -%>
+<%= show_detail(detail, true) %>
+<% end -%>
+
+<%= @journal.notes if @journal.notes? %>
+----------------------------------------
+<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/issue_edit.text.plain.rhtml b/app/views/mailer/issue_edit.text.plain.rhtml
deleted file mode 100644 (file)
index 870f8fa..0000000
--- a/app/views/mailer/issue_edit.text.plain.rhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
-
-<% for detail in @journal.details -%>
-<%= show_detail(detail, true) %>
-<% end -%>
-
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>

diff --git a/app/views/mailer/lost_password.text.erb b/app/views/mailer/lost_password.text.erb
new file mode 100644 (file)
index 0000000..f5000ed
--- /dev/null
+++ b/app/views/mailer/lost_password.text.erb
@@ -0,0 +1,4 @@
+<%= l(:mail_body_lost_password) %>
+<%= @url %>
+
+<%= l(:field_login) %>: <%= @token.user.login %>

diff --git a/app/views/mailer/lost_password.text.plain.rhtml b/app/views/mailer/lost_password.text.plain.rhtml
deleted file mode 100644 (file)
index f5000ed..0000000
--- a/app/views/mailer/lost_password.text.plain.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= l(:mail_body_lost_password) %>
-<%= @url %>
-
-<%= l(:field_login) %>: <%= @token.user.login %>

diff --git a/app/views/mailer/message_posted.text.erb b/app/views/mailer/message_posted.text.erb
new file mode 100644 (file)
index 0000000..ef6a3b3
--- /dev/null
+++ b/app/views/mailer/message_posted.text.erb
@@ -0,0 +1,4 @@
+<%= @message_url %>
+<%= @message.author %>
+
+<%= @message.content %>

diff --git a/app/views/mailer/message_posted.text.plain.rhtml b/app/views/mailer/message_posted.text.plain.rhtml
deleted file mode 100644 (file)
index ef6a3b3..0000000
--- a/app/views/mailer/message_posted.text.plain.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= @message_url %>
-<%= @message.author %>
-
-<%= @message.content %>

diff --git a/app/views/mailer/news_added.text.erb b/app/views/mailer/news_added.text.erb
new file mode 100644 (file)
index 0000000..c8ae303
--- /dev/null
+++ b/app/views/mailer/news_added.text.erb
@@ -0,0 +1,5 @@
+<%= @news.title %>
+<%= @news_url %>
+<%= @news.author.name %>
+
+<%= @news.description %>

diff --git a/app/views/mailer/news_added.text.plain.rhtml b/app/views/mailer/news_added.text.plain.rhtml
deleted file mode 100644 (file)
index c8ae303..0000000
--- a/app/views/mailer/news_added.text.plain.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= @news.title %>
-<%= @news_url %>
-<%= @news.author.name %>
-
-<%= @news.description %>

diff --git a/app/views/mailer/news_comment_added.text.erb b/app/views/mailer/news_comment_added.text.erb
new file mode 100644 (file)
index 0000000..aadbc37
--- /dev/null
+++ b/app/views/mailer/news_comment_added.text.erb
@@ -0,0 +1,6 @@
+<%= @news.title %>
+<%= @news_url %>
+
+<%= l(:text_user_wrote, :value => @comment.author) %>
+
+<%= @comment.comments %>

diff --git a/app/views/mailer/news_comment_added.text.plain.rhtml b/app/views/mailer/news_comment_added.text.plain.rhtml
deleted file mode 100644 (file)
index aadbc37..0000000
--- a/app/views/mailer/news_comment_added.text.plain.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= @news.title %>
-<%= @news_url %>
-
-<%= l(:text_user_wrote, :value => @comment.author) %>
-
-<%= @comment.comments %>

diff --git a/app/views/mailer/register.text.erb b/app/views/mailer/register.text.erb
new file mode 100644 (file)
index 0000000..102a15e
--- /dev/null
+++ b/app/views/mailer/register.text.erb
@@ -0,0 +1,2 @@
+<%= l(:mail_body_register) %>
+<%= @url %>

diff --git a/app/views/mailer/register.text.plain.rhtml b/app/views/mailer/register.text.plain.rhtml
deleted file mode 100644 (file)
index 102a15e..0000000
--- a/app/views/mailer/register.text.plain.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-<%= l(:mail_body_register) %>
-<%= @url %>

diff --git a/app/views/mailer/reminder.text.erb b/app/views/mailer/reminder.text.erb
new file mode 100644 (file)
index 0000000..c9e27dc
--- /dev/null
+++ b/app/views/mailer/reminder.text.erb
@@ -0,0 +1,7 @@
+<%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %>:
+
+<% @issues.each do |issue| -%>
+* <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %>
+<% end -%>
+
+<%= @issues_url %>

diff --git a/app/views/mailer/reminder.text.plain.rhtml b/app/views/mailer/reminder.text.plain.rhtml
deleted file mode 100644 (file)
index c9e27dc..0000000
--- a/app/views/mailer/reminder.text.plain.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %>:
-
-<% @issues.each do |issue| -%>
-* <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %>
-<% end -%>
-
-<%= @issues_url %>

diff --git a/app/views/mailer/test.text.erb b/app/views/mailer/test.text.erb
new file mode 100644 (file)
index 0000000..790d6ab
--- /dev/null
+++ b/app/views/mailer/test.text.erb
@@ -0,0 +1,2 @@
+This is a test email sent by Redmine.
+Redmine URL: <%= @url %>

diff --git a/app/views/mailer/test.text.plain.rhtml b/app/views/mailer/test.text.plain.rhtml
deleted file mode 100644 (file)
index 790d6ab..0000000
--- a/app/views/mailer/test.text.plain.rhtml
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a test email sent by Redmine.
-Redmine URL: <%= @url %>

diff --git a/app/views/mailer/wiki_content_added.text.erb b/app/views/mailer/wiki_content_added.text.erb
new file mode 100644 (file)
index 0000000..5e8c77f
--- /dev/null
+++ b/app/views/mailer/wiki_content_added.text.erb
@@ -0,0 +1,5 @@
+<%= l(:mail_body_wiki_content_added, :id => h(@wiki_content.page.pretty_title),
+                                     :author => h(@wiki_content.author)) %>
+<%= @wiki_content.comments %>
+
+<%= @wiki_content_url %>

diff --git a/app/views/mailer/wiki_content_added.text.plain.rhtml b/app/views/mailer/wiki_content_added.text.plain.rhtml
deleted file mode 100644 (file)
index 5e8c77f..0000000
--- a/app/views/mailer/wiki_content_added.text.plain.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= l(:mail_body_wiki_content_added, :id => h(@wiki_content.page.pretty_title),
-                                     :author => h(@wiki_content.author)) %>
-<%= @wiki_content.comments %>
-
-<%= @wiki_content_url %>

diff --git a/app/views/mailer/wiki_content_updated.text.erb b/app/views/mailer/wiki_content_updated.text.erb
new file mode 100644 (file)
index 0000000..4b3a973
--- /dev/null
+++ b/app/views/mailer/wiki_content_updated.text.erb
@@ -0,0 +1,8 @@
+<%= l(:mail_body_wiki_content_updated, :id => h(@wiki_content.page.pretty_title),
+                                       :author => h(@wiki_content.author)) %>
+<%= @wiki_content.comments %>
+
+<%= @wiki_content.page.pretty_title %>:
+<%= @wiki_content_url %>
+<%= l(:label_view_diff) %>:
+<%= @wiki_diff_url %>

diff --git a/app/views/mailer/wiki_content_updated.text.plain.rhtml b/app/views/mailer/wiki_content_updated.text.plain.rhtml
deleted file mode 100644 (file)
index 4b3a973..0000000
--- a/app/views/mailer/wiki_content_updated.text.plain.rhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= l(:mail_body_wiki_content_updated, :id => h(@wiki_content.page.pretty_title),
-                                       :author => h(@wiki_content.author)) %>
-<%= @wiki_content.comments %>
-
-<%= @wiki_content.page.pretty_title %>:
-<%= @wiki_content_url %>
-<%= l(:label_view_diff) %>:
-<%= @wiki_diff_url %>