diff --git a/app/models/mailer.rb b/app/models/mailer.rb index a2d9ddba..60a5a827 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -219,6 +219,21 @@ class Mailer < ActionMailer::Base body[:content_for_layout] = render(:file => method_name, :body => body) ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}", :use_full_path => true) end + + # for the case of plain text only + def body(*params) + value = super(*params) + if Setting.plain_text_mail? + templates = Dir.glob("#{template_path}/#{@template}.text.plain.{rhtml,erb}") + unless String === @body or templates.empty? + template = File.basename(templates.first) + @body[:content_for_layout] = render(:file => template, :body => @body) + @body = ActionView::Base.new(template_root, @body, self).render(:file => "mailer/layout.text.plain.rhtml", :use_full_path => true) + return @body + end + end + return value + end # Makes partial rendering work with Rails 1.2 (retro-compatibility) def self.controller_path diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml index 36701463..a9a5f474 100644 --- a/app/views/settings/_notifications.rhtml +++ b/app/views/settings/_notifications.rhtml @@ -8,6 +8,10 @@

<%= check_box_tag 'settings[bcc_recipients]', 1, Setting.bcc_recipients? %> <%= hidden_field_tag 'settings[bcc_recipients]', 0 %>

+ +

+<%= check_box_tag 'settings[plain_text_mail]', 1, Setting.plain_text_mail? %> +<%= hidden_field_tag 'settings[plain_text_mail]', 0 %>

<%=l(:text_select_mail_notifications)%> diff --git a/config/settings.yml b/config/settings.yml index e1ad341d..7d6a9d1d 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -46,6 +46,8 @@ mail_from: default: redmine@example.net bcc_recipients: default: 1 +plain_text_mail: + default: 0 text_formatting: default: textile wiki_compression: diff --git a/lang/bg.yml b/lang/bg.yml index f8d2e5e2..b6aa4774 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -640,3 +640,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/ca.yml b/lang/ca.yml index 40ba5fea..f4d185c5 100644 --- a/lang/ca.yml +++ b/lang/ca.yml @@ -641,3 +641,4 @@ default_activity_development: Desenvolupament enumeration_issue_priorities: Prioritat dels assumptes enumeration_doc_categories: Categories del document enumeration_activities: Activitats (seguidor de temps) +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/cs.yml b/lang/cs.yml index cf2cb099..dcf778f0 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -645,3 +645,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/da.yml b/lang/da.yml index 0ee1b251..21bfb3a0 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -641,3 +641,4 @@ default_activity_development: Udvikling enumeration_issue_priorities: Sagsprioriteter enumeration_doc_categories: Dokumentkategorier enumeration_activities: Aktiviteter (tidsregistrering) +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/de.yml b/lang/de.yml index 7aa2d971..5041a31b 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -641,3 +641,4 @@ default_activity_development: Entwicklung enumeration_issue_priorities: Ticket-Prioritäten enumeration_doc_categories: Dokumentenkategorien enumeration_activities: Aktivitäten (Zeiterfassung) +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/en.yml b/lang/en.yml index 8a73a399..5c7e30c2 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -195,6 +195,7 @@ setting_attachment_max_size: Attachment max. size setting_issues_export_limit: Issues export limit setting_mail_from: Emission email address setting_bcc_recipients: Blind carbon copy recipients (bcc) +setting_plain_text_mail: plain text mail (no HTML) setting_host_name: Host name setting_text_formatting: Text formatting setting_wiki_compression: Wiki history compression diff --git a/lang/es.yml b/lang/es.yml index ae367d84..70b09f76 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -643,3 +643,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/fi.yml b/lang/fi.yml index 225563b3..ce7a3e06 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -640,3 +640,4 @@ setting_commit_logs_encoding: Commit messages encoding notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/fr.yml b/lang/fr.yml index b6407806..b81c6d3c 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -641,3 +641,4 @@ enumeration_issue_priorities: Priorités des demandes enumeration_doc_categories: Catégories des documents enumeration_activities: Activités (suivi du temps) notice_unable_delete_version: Unable to delete version +setting_plain_text_mail: mail texte brut (non HTML) diff --git a/lang/he.yml b/lang/he.yml index 07962d2d..e4373365 100644 --- a/lang/he.yml +++ b/lang/he.yml @@ -640,3 +640,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/hu.yml b/lang/hu.yml index 3a3d18a1..c1fcdd2b 100644 --- a/lang/hu.yml +++ b/lang/hu.yml @@ -641,3 +641,4 @@ setting_sequential_project_identifiers: Szekvenciális projekt azonosítók gene notice_unable_delete_version: A verziót nem lehet törölni label_renamed: átnevezve label_copied: lemásolva +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/it.yml b/lang/it.yml index bca75560..4e40fa08 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -640,3 +640,4 @@ setting_sequential_project_identifiers: Genera progetti con identificativi in se notice_unable_delete_version: Impossibile cancellare la versione label_renamed: rinominato label_copied: copiato +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/ja.yml b/lang/ja.yml index 4e46212b..165aabd3 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -552,6 +552,7 @@ notice_account_pending: アカウントは作成済みで、管理者の承認 field_time_zone: タイムゾーン text_caracters_minimum: 最低%d文字の長さが必要です setting_bcc_recipients: ブラインドカーボンコピーで受信(bcc) +setting_plain_text_mail: プレインテキストのみ(HTMLなし) button_annotate: 注釈 label_issues_by: %s別のチケット field_searchable: Searchable diff --git a/lang/ko.yml b/lang/ko.yml index 95aa8716..fae3345a 100644 --- a/lang/ko.yml +++ b/lang/ko.yml @@ -640,3 +640,4 @@ setting_sequential_project_identifiers: 프로젝트 실별자를 순자적으 notice_unable_delete_version: 삭제 할 수 없는 버전 입니다. label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/lt.yml b/lang/lt.yml index f29c28c4..a92b2f00 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -642,3 +642,4 @@ button_quote: Cituoti notice_unable_delete_version: Neimanoma panaikinti versiją label_renamed: pervardintas label_copied: nukopijuotas +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/nl.yml b/lang/nl.yml index 19d84500..ee96aa7f 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -641,4 +641,5 @@ button_quote: Citaat setting_sequential_project_identifiers: Genereer sequentiële projectidentiteiten notice_unable_delete_version: Niet mogelijk om deze versie te verwijderen. label_renamed: hernoemd -label_copied: gekopieerd \ No newline at end of file +label_copied: gekopieerd +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/no.yml b/lang/no.yml index 8cd6952c..4005f068 100644 --- a/lang/no.yml +++ b/lang/no.yml @@ -641,3 +641,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/pl.yml b/lang/pl.yml index ee9bbaaa..45624771 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -646,3 +646,4 @@ label_renamed: przemianowano label_copied: skopiowano field_vf_watcher: Obserwator field_vf_personnel: Personel +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/pt-br.yml b/lang/pt-br.yml index 7c07729f..5dea29a2 100644 --- a/lang/pt-br.yml +++ b/lang/pt-br.yml @@ -641,3 +641,4 @@ enumeration_activities: Atividades (time tracking) notice_unable_delete_version: Não foi possível excluir a versão label_renamed: renomeado label_copied: copiado +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/pt.yml b/lang/pt.yml index 1cf9f3a1..e9f91b7f 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -642,3 +642,4 @@ default_activity_development: Desenvolvimento enumeration_issue_priorities: Prioridade de tarefas enumeration_doc_categories: Categorias de documentos enumeration_activities: Actividades (Contagem de tempo) +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/ro.yml b/lang/ro.yml index 94278256..2aabe671 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -640,3 +640,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/ru.yml b/lang/ru.yml index ce5e43b7..70149283 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -673,3 +673,4 @@ text_user_wrote: '%s написал(а):' text_wiki_destroy_confirmation: Вы уверены, что хотите удалить данную Wiki и все содержимое? text_workflow_edit: Выберите роль и трекер для редактирования последовательности состояний +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/sr.yml b/lang/sr.yml index 720dfcdf..5de1c695 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -641,3 +641,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/sv.yml b/lang/sv.yml index 393ade81..8cd2eb7e 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -641,3 +641,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/th.yml b/lang/th.yml index 362e4475..b0f51e8e 100644 --- a/lang/th.yml +++ b/lang/th.yml @@ -643,3 +643,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/tr.yml b/lang/tr.yml index ba9c0b41..7661e24f 100644 --- a/lang/tr.yml +++ b/lang/tr.yml @@ -641,3 +641,4 @@ general_csv_decimal_separator: '.' notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/uk.yml b/lang/uk.yml index de5f65eb..074aa9a8 100644 --- a/lang/uk.yml +++ b/lang/uk.yml @@ -642,3 +642,4 @@ setting_sequential_project_identifiers: Generate sequential project identifiers notice_unable_delete_version: Unable to delete version label_renamed: renamed label_copied: copied +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml index 6feb0a0e..74943363 100644 --- a/lang/zh-tw.yml +++ b/lang/zh-tw.yml @@ -641,3 +641,4 @@ default_activity_development: 開發 enumeration_issue_priorities: 項目優先權 enumeration_doc_categories: 文件分類 enumeration_activities: 活動 (時間追蹤) +setting_plain_text_mail: plain text only (no HTML) diff --git a/lang/zh.yml b/lang/zh.yml index d2e571b4..fd752eec 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -641,3 +641,4 @@ default_activity_development: 开发 enumeration_issue_priorities: 问题优先级 enumeration_doc_categories: 文档类别 enumeration_activities: 活动（时间跟踪） +setting_plain_text_mail: plain text only (no HTML) diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index 1c03bafb..e3a21a57 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -32,12 +32,22 @@ class MailerTest < Test::Unit::TestCase assert_kind_of TMail::Mail, mail # link to the main ticket assert mail.body.include?('Bug #1: Can\'t print recipes') - + # link to a referenced ticket assert mail.body.include?('#2') # link to a changeset assert mail.body.include?('r2') end + + def test_plain_text_mail + Setting.plain_text_mail = 1 + journal = Journal.find(2) + Mailer.deliver_issue_edit(journal) + mail = ActionMailer::Base.deliveries.last + assert !mail.body.include?('Bug #1: Can\'t print recipes') + end + + # test mailer methods for each language def test_issue_add