Notifications about issues (add/edit) are now sent in plain text and html.

Removed lang specific strings in the corresponding mail templates, so that there is only one template for all languages.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@723 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/mailer.rb

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Mailer < ActionMailer::Base
+  helper ApplicationHelper
   helper IssuesHelper
   
   def account_information(user, password)

app/views/mailer/_issue_text_html.rhtml

@@ -0,0 +1,10 @@
+<%= link_to "#{issue.tracker.name} ##{issue.id}",  :only_path => false, :host => Setting.host_name, :controller => 'issues', :action => 'show', :id => issue %>:
+<%= issue.subject %>
+
+<ul>
+    <li><%=l(:field_author)%>: <%= issue.author.name %></li>
+    <li><%=l(:field_assigned_to)%>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %></li>
+    <li><%=l(:field_status)%>: <%= issue.status.name %></li>
+</ul>
+
+<%= textilizable(issue.description) %>

app/views/mailer/_issue_text_plain.rhtml

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

app/views/mailer/issue_add.rhtml

@@ -1,3 +0,0 @@
-Issue #<%= @issue.id %> has been reported.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add.text.html.rhtml

@@ -0,0 +1,3 @@
+<%= l(:text_issue_added, "##{@issue.id}") %>
+<hr />
+<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add.text.plain.rhtml

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

app/views/mailer/issue_add_bg.rhtml

@@ -1,3 +0,0 @@
-Публикувана е нова задача с номер #<%= @issue.id %>.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_de.rhtml

@@ -1,3 +0,0 @@
-Ticket Nr. #<%= @issue.id %> wurde erstellt.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_fr.rhtml

@@ -1,3 +0,0 @@
-Une nouvelle demande (#<%= @issue.id %>) a été soumise.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_it.rhtml

@@ -1,3 +0,0 @@
-E' stata segnalata l'anomalia #<%= @issue.id %>.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_ja.rhtml

@@ -1,3 +0,0 @@
-問題 #<%= @issue.id %> が報告されました。
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_nl.rhtml

@@ -1,3 +0,0 @@
-Issue #<%= @issue.id %> is gerapporteerd.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_pt-br.rhtml

@@ -1,3 +0,0 @@
-Tarefa #<%= @issue.id %> foi incluída.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_pt.rhtml

@@ -1,3 +0,0 @@
-Tarefa #<%= @issue.id %> foi incluída.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_sv.rhtml

@@ -1,3 +0,0 @@
-Brist #<%= @issue.id %> har rapporterats.
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_add_zh.rhtml

@@ -1,3 +0,0 @@
-任务 #<%= @issue.id %> 已报告
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit.text.html.rhtml

@@ -0,0 +1,10 @@
+<%= l(:text_issue_updated, "##{@issue.id}") %><br />
+<em><%= @journal.user.name %></em>
+<ul>
+<% for detail in @journal.details %>
+    <li><%= show_detail(detail, true) %></li>
+<% end %>
+</ul>
+<%= textilizable(@journal.notes) %>
+<hr />
+<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit.text.plain.rhtml

@@ -1,8 +1,8 @@
-Issue #<%= @issue.id %> has been updated.
+<%= l(:text_issue_updated, "##{@issue.id}") %>
 <%= @journal.user.name %>
 <% for detail in @journal.details %>
 <%= show_detail(detail, true) %>
 <% end %>
 <%= @journal.notes if @journal.notes? %>
 ----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
+<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_bg.rhtml

@@ -1,8 +0,0 @@
-Задача #<%= @issue.id %> е обновена.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_de.rhtml

@@ -1,8 +0,0 @@
-Ticket #<%= @issue.id %> wurde aktualisiert.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_fr.rhtml

@@ -1,8 +0,0 @@
-La demande #<%= @issue.id %> a été mise à jour.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_it.rhtml

@@ -1,8 +0,0 @@
-L'anomalia #<%= @issue.id %> e' stata aggiornata.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_ja.rhtml

@@ -1,8 +0,0 @@
-問題 #<%= @issue.id %> が更新されました。
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_nl.rhtml

@@ -1,8 +0,0 @@
-Issue #<%= @issue.id %> is gewijzigd.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_pt-br.rhtml

@@ -1,8 +0,0 @@
-Tarefa #<%= @issue.id %> foi alterada.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_pt.rhtml

@@ -1,8 +0,0 @@
-Tarefa #<%= @issue.id %> foi alterada.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_sv.rhtml

@@ -1,8 +0,0 @@
-Brist #<%= @issue.id %> har uppdaterats.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

app/views/mailer/issue_edit_zh.rhtml

@@ -1,8 +0,0 @@
-任务 #<%= @issue.id %> 已更新。
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>

lang/bg.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: Няма дефиниран workflow за този т
 text_unallowed_characters: Непозволени символи
 text_comma_separated: Позволено е изброяване (с разделител запетая).
 text_issues_ref_in_commit_messages: Отбелязване и приключване на задачи от commit съобщения
+text_issue_added: Публикувана е нова задача с номер %s.
+text_issue_updated: Задача %s е обновена.
 
 default_role_manager: Мениджър
 default_role_developper: Разработчик

lang/de.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: No workflow defined for this tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: Ticket %s wurde erstellt.
+text_issue_updated: Ticket %s wurde aktualisiert.
 
 default_role_manager: Manager
 default_role_developper: Developer

lang/en.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: No workflow defined for this tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: Issue %s has been reported.
+text_issue_updated: Issue %s has been updated.
 
 default_role_manager: Manager
 default_role_developper: Developer

lang/es.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: No workflow defined for this tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: Issue %s has been reported.
+text_issue_updated: Issue %s has been updated.
 
 default_role_manager: Manager
 default_role_developper: Desarrollador

lang/fr.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker
 text_unallowed_characters: Caractères non autorisés
 text_comma_separated: Plusieurs valeurs possibles (séparées par des virgules).
 text_issues_ref_in_commit_messages: Référencement et résolution des demandes dans les commentaires de commits
+text_issue_added: La demande %s a été soumise.
+text_issue_updated: La demande %s a été mise à jour.
 
 default_role_manager: Manager
 default_role_developper: Développeur

lang/it.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: Nessun workflow definito per questo tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: "E' stata segnalata l'anomalia %s."
+text_issue_updated: "L'anomalia %s e' stata aggiornata."
 
 default_role_manager: Manager
 default_role_developper: Sviluppatore

lang/ja.yml

@@ -473,6 +473,8 @@ text_tracker_no_workflow: このトラッカーにワークフローが定義さ
 text_unallowed_characters: 使えない文字です
 text_comma_separated: (カンマで区切った)複数の値が使えます
 text_issues_ref_in_commit_messages: コミットメッセージ内で問題の参照/修正
+text_issue_added: 問題 %s が報告されました。
+text_issue_updated: 問題 %s が更新されました。
 
 default_role_manager: 管理者
 default_role_developper: 開発者

lang/nl.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: Geen workflow gedefinieerd voor deze tracker
 text_unallowed_characters: Niet toegestane tekens
 text_coma_separated: Meerdere waarden toegestaan (door komma's gescheiden).
 text_issues_ref_in_commit_messages: Opzoeken en aanpassen van issues in commit berichten
+text_issue_added: Issue %s is gerapporteerd.
+text_issue_updated: Issue %s is gewijzigd.
 
 default_role_manager: Manager
 default_role_developper: Ontwikkelaar

lang/pt-br.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: Sem workflow definido para este tipo.
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: Tarefa %s foi incluída.
+text_issue_updated: Tarefa %s foi alterada.
 
 default_role_manager: Analista de Negocio ou Gerente de Projeto
 default_role_developper: Desenvolvedor

lang/pt.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: Sem workflow definido para este tipo.
 text_unallowed_characters: Caracteres não permitidos
 text_comma_separated: Permitido múltiplos valores (separados por vírgula).
 text_issues_ref_in_commit_messages: Referenciando e arrumando tarefas nas mensagens de commit
+text_issue_added: Tarefa %s foi incluída.
+text_issue_updated: Tarefa %s foi alterada.
 
 default_role_manager: Analista de Negócio ou Gerente de Projeto
 default_role_developper: Desenvolvedor

lang/sv.yml

@@ -472,6 +472,8 @@ text_tracker_no_workflow: Inget workflow definerat för denna tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: Brist %s har rapporterats.
+text_issue_updated: Brist %s har uppdaterats.
 
 default_role_manager: Förvaltare
 default_role_developper: Utvecklare

lang/zh.yml

@@ -474,6 +474,8 @@ text_tracker_no_workflow: No workflow defined for this tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: %s ѱ
+text_issue_updated: %s Ѹ
 
 default_role_manager: 管理员
 default_role_developper: 开发人员