From a4c4edacfdf7665c29115b8707cb2814c11abaaa Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 26 Sep 2011 16:22:38 +0000 Subject: [PATCH] Rails3: mail: rename app/views/mailer/*.text.plain.rhtml to app/views/mailer/*.text.erb (#6317) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7536 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/mailer.rb | 4 ++-- ..._activated.text.plain.rhtml => account_activated.text.erb} | 0 ...t.text.plain.rhtml => account_activation_request.text.erb} | 0 ...ormation.text.plain.rhtml => account_information.text.erb} | 0 ...ents_added.text.plain.rhtml => attachments_added.text.erb} | 0 ...ocument_added.text.plain.rhtml => document_added.text.erb} | 0 .../mailer/{issue_add.text.plain.rhtml => issue_add.text.erb} | 0 .../{issue_edit.text.plain.rhtml => issue_edit.text.erb} | 0 ...{lost_password.text.plain.rhtml => lost_password.text.erb} | 0 ...essage_posted.text.plain.rhtml => message_posted.text.erb} | 0 .../{news_added.text.plain.rhtml => news_added.text.erb} | 0 ...ent_added.text.plain.rhtml => news_comment_added.text.erb} | 0 .../mailer/{register.text.plain.rhtml => register.text.erb} | 0 .../mailer/{reminder.text.plain.rhtml => reminder.text.erb} | 0 app/views/mailer/{test.text.plain.rhtml => test.text.erb} | 0 ...ent_added.text.plain.rhtml => wiki_content_added.text.erb} | 0 ...updated.text.plain.rhtml => wiki_content_updated.text.erb} | 0 17 files changed, 2 insertions(+), 2 deletions(-) rename app/views/mailer/{account_activated.text.plain.rhtml => account_activated.text.erb} (100%) rename app/views/mailer/{account_activation_request.text.plain.rhtml => account_activation_request.text.erb} (100%) rename app/views/mailer/{account_information.text.plain.rhtml => account_information.text.erb} (100%) rename app/views/mailer/{attachments_added.text.plain.rhtml => attachments_added.text.erb} (100%) rename app/views/mailer/{document_added.text.plain.rhtml => document_added.text.erb} (100%) rename app/views/mailer/{issue_add.text.plain.rhtml => issue_add.text.erb} (100%) rename app/views/mailer/{issue_edit.text.plain.rhtml => issue_edit.text.erb} (100%) rename app/views/mailer/{lost_password.text.plain.rhtml => lost_password.text.erb} (100%) rename app/views/mailer/{message_posted.text.plain.rhtml => message_posted.text.erb} (100%) rename app/views/mailer/{news_added.text.plain.rhtml => news_added.text.erb} (100%) rename app/views/mailer/{news_comment_added.text.plain.rhtml => news_comment_added.text.erb} (100%) rename app/views/mailer/{register.text.plain.rhtml => register.text.erb} (100%) rename app/views/mailer/{reminder.text.plain.rhtml => reminder.text.erb} (100%) rename app/views/mailer/{test.text.plain.rhtml => test.text.erb} (100%) rename app/views/mailer/{wiki_content_added.text.plain.rhtml => wiki_content_added.text.erb} (100%) rename app/views/mailer/{wiki_content_updated.text.plain.rhtml => wiki_content_updated.text.erb} (100%) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index f62e24d51..591f4e97c 100644 --- 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.plain.rhtml b/app/views/mailer/account_activated.text.erb similarity index 100% rename from app/views/mailer/account_activated.text.plain.rhtml rename to app/views/mailer/account_activated.text.erb diff --git a/app/views/mailer/account_activation_request.text.plain.rhtml b/app/views/mailer/account_activation_request.text.erb similarity index 100% rename from app/views/mailer/account_activation_request.text.plain.rhtml rename to app/views/mailer/account_activation_request.text.erb diff --git a/app/views/mailer/account_information.text.plain.rhtml b/app/views/mailer/account_information.text.erb similarity index 100% rename from app/views/mailer/account_information.text.plain.rhtml rename to app/views/mailer/account_information.text.erb diff --git a/app/views/mailer/attachments_added.text.plain.rhtml b/app/views/mailer/attachments_added.text.erb similarity index 100% rename from app/views/mailer/attachments_added.text.plain.rhtml rename to app/views/mailer/attachments_added.text.erb diff --git a/app/views/mailer/document_added.text.plain.rhtml b/app/views/mailer/document_added.text.erb similarity index 100% rename from app/views/mailer/document_added.text.plain.rhtml rename to app/views/mailer/document_added.text.erb diff --git a/app/views/mailer/issue_add.text.plain.rhtml b/app/views/mailer/issue_add.text.erb similarity index 100% rename from app/views/mailer/issue_add.text.plain.rhtml rename to app/views/mailer/issue_add.text.erb diff --git a/app/views/mailer/issue_edit.text.plain.rhtml b/app/views/mailer/issue_edit.text.erb similarity index 100% rename from app/views/mailer/issue_edit.text.plain.rhtml rename to app/views/mailer/issue_edit.text.erb diff --git a/app/views/mailer/lost_password.text.plain.rhtml b/app/views/mailer/lost_password.text.erb similarity index 100% rename from app/views/mailer/lost_password.text.plain.rhtml rename to app/views/mailer/lost_password.text.erb diff --git a/app/views/mailer/message_posted.text.plain.rhtml b/app/views/mailer/message_posted.text.erb similarity index 100% rename from app/views/mailer/message_posted.text.plain.rhtml rename to app/views/mailer/message_posted.text.erb diff --git a/app/views/mailer/news_added.text.plain.rhtml b/app/views/mailer/news_added.text.erb similarity index 100% rename from app/views/mailer/news_added.text.plain.rhtml rename to app/views/mailer/news_added.text.erb diff --git a/app/views/mailer/news_comment_added.text.plain.rhtml b/app/views/mailer/news_comment_added.text.erb similarity index 100% rename from app/views/mailer/news_comment_added.text.plain.rhtml rename to app/views/mailer/news_comment_added.text.erb diff --git a/app/views/mailer/register.text.plain.rhtml b/app/views/mailer/register.text.erb similarity index 100% rename from app/views/mailer/register.text.plain.rhtml rename to app/views/mailer/register.text.erb diff --git a/app/views/mailer/reminder.text.plain.rhtml b/app/views/mailer/reminder.text.erb similarity index 100% rename from app/views/mailer/reminder.text.plain.rhtml rename to app/views/mailer/reminder.text.erb diff --git a/app/views/mailer/test.text.plain.rhtml b/app/views/mailer/test.text.erb similarity index 100% rename from app/views/mailer/test.text.plain.rhtml rename to app/views/mailer/test.text.erb diff --git a/app/views/mailer/wiki_content_added.text.plain.rhtml b/app/views/mailer/wiki_content_added.text.erb similarity index 100% rename from app/views/mailer/wiki_content_added.text.plain.rhtml rename to app/views/mailer/wiki_content_added.text.erb diff --git a/app/views/mailer/wiki_content_updated.text.plain.rhtml b/app/views/mailer/wiki_content_updated.text.erb similarity index 100% rename from app/views/mailer/wiki_content_updated.text.plain.rhtml rename to app/views/mailer/wiki_content_updated.text.erb