* Emails footer can now be customized from the admin interface (Admin -> Email notifi...

* Added html part to all email templates.

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

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index bceab361c453437fd7f8651a635a1f6a9636538a..b448affcce132bc332fec72aed90c808cbe091c8 100644 (file)
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -49,6 +49,7 @@ class AdminController < ApplicationController
     @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted)
     if request.post?
       Setting.notified_events = (params[:notified_events] || [])
+      Setting.emails_footer = params[:emails_footer] if params[:emails_footer]
       flash[:notice] = l(:notice_successful_update)
       redirect_to :controller => 'admin', :action => 'mail_options'
     end

diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml
index 2f61af4fa8855188e2bd03008d4a805ecb8c16dc..5f1fd9bb3b151bc04151f6827ea184d5406078f3 100644 (file)
--- a/app/views/admin/mail_options.rhtml
+++ b/app/views/admin/mail_options.rhtml
@@ -8,12 +8,15 @@
 
 <fieldset class="box"><legend><%=l(:text_select_mail_notifications)%></legend>
 <% @notifiables.each do |notifiable| %>
-  <p><label><%= check_box_tag "notified_events[]", notifiable, Setting.notified_events.include?(notifiable) %>
-  <%= notifiable.humanize %></label></p>
+  <label><%= check_box_tag "notified_events[]", notifiable, Setting.notified_events.include?(notifiable) %>
+  <%= notifiable.humanize %></label><br />
 <% end %>
-<div class="clear"></div>
+<p><%= check_all_links('mail-options-form') %></p>
+</fieldset>
+
+<fieldset class="box"><legend>Emails footer</legend>
+<%= text_area_tag 'emails_footer', Setting.emails_footer, :class => 'wiki-edit', :rows => 5 %>
 </fieldset>
 
-<p><%= check_all_links('mail-options-form') %></p>
 <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/app/views/mailer/account_information.rhtml b/app/views/mailer/account_information.rhtml
index 058d5fc44df48df7c77276d728c0f4e9fba7f0b1..98b2916a76caebc287bb329525261fd8c8ed1f0b 100644 (file)
--- a/app/views/mailer/account_information.rhtml
+++ b/app/views/mailer/account_information.rhtml
@@ -7,3 +7,6 @@ Log in: <%= url_for :only_path => false, :host => Setting.host_name, :controller
 <% unless @user.auth_source %>
 You can change your password here: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
 <% end %>
+
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/account_information_fr.rhtml b/app/views/mailer/account_information_fr.rhtml
index 9210988f4ea9ef3acc0c71c305f469c1c336e117..71df34532e9afa52b57948a7830feb6f6dfd629e 100644 (file)
--- a/app/views/mailer/account_information_fr.rhtml
+++ b/app/views/mailer/account_information_fr.rhtml
@@ -7,3 +7,6 @@ Pour se connecter à l'application: <%= url_for :only_path => false, :host => Se
 <% unless @user.auth_source %>
 Vous pouvez changer votre mot de passe à l'adresse: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
 <% end %>
+
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/account_information_pl.rhtml b/app/views/mailer/account_information_pl.rhtml
index f73108a74a562e675a8d45281cda8a7f27080596..7f9060b2defef0d8b20beb77dd21063d7b7424df 100644 (file)
--- a/app/views/mailer/account_information_pl.rhtml
+++ b/app/views/mailer/account_information_pl.rhtml
@@ -7,3 +7,6 @@ Zaloguj: <%= url_for :only_path => false, :host => Setting.host_name, :controlle
 <% unless @user.auth_source %>
 Możesz zmienić swoje hasło tutaj: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
 <% end %>
+
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/attachments_added.text.html.rhtml b/app/views/mailer/attachments_added.text.html.rhtml
index 336cad69bcf8a9cd91df25d1b613ac7fc5179629..9bb30db1d29058d28bb61659f63fcc9cbb01921d 100644 (file)
--- a/app/views/mailer/attachments_added.text.html.rhtml
+++ b/app/views/mailer/attachments_added.text.html.rhtml
@@ -3,3 +3,5 @@
 <ul><% @attachments.each do |attachment | %>
 <li><%= attachment.filename %></li>
 <% end %></ul>
+<hr />
+<small><em><%= textilizable Setting.emails_footer %></em></small>

diff --git a/app/views/mailer/attachments_added.text.plain.rhtml b/app/views/mailer/attachments_added.text.plain.rhtml
index 22df2203c56d8dc72445f7b9ad9e5d62093b16b1..7e4245ef298121213fbb4ab86fa702fa11c297ec 100644 (file)
--- a/app/views/mailer/attachments_added.text.plain.rhtml
+++ b/app/views/mailer/attachments_added.text.plain.rhtml
@@ -2,3 +2,5 @@
 - <%= attachment.filename %><% end %>
 
 <%= url_for @url %>
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/document_added.text.html.rhtml b/app/views/mailer/document_added.text.html.rhtml
index 2a574a1cce2e9d07713f785ffa205ea3354d319e..d7d6558b87783f83b4941f8fbc3a05d7f378660e 100644 (file)
--- a/app/views/mailer/document_added.text.html.rhtml
+++ b/app/views/mailer/document_added.text.html.rhtml
@@ -2,3 +2,5 @@
 (<%= @document.category.name %>)<br />
 <br />
 <%= textilizable(@document.description) %>
+<hr />
+<small><em><%= textilizable Setting.emails_footer %></em></small>

diff --git a/app/views/mailer/document_added.text.plain.rhtml b/app/views/mailer/document_added.text.plain.rhtml
index ee8f3e6be47fc98da84fd8e352888767bb7226a3..bb42758f7a5180b4216e6d9432a6d2a18688b2d8 100644 (file)
--- a/app/views/mailer/document_added.text.plain.rhtml
+++ b/app/views/mailer/document_added.text.plain.rhtml
@@ -2,3 +2,5 @@
 <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %>
 
 <%= @document.description %>
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/issue_add.text.html.rhtml b/app/views/mailer/issue_add.text.html.rhtml
index a7ef8ece8c49db86be3ef400fb144d68d520c8db..7a0712c368237b4f56b717440679c41f21b25140 100644 (file)
--- a/app/views/mailer/issue_add.text.html.rhtml
+++ b/app/views/mailer/issue_add.text.html.rhtml
@@ -1,3 +1,5 @@
 <%= l(:text_issue_added, "##{@issue.id}") %>
 <hr />
 <%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %>
+<hr />
+<small><em><%= textilizable Setting.emails_footer %></em></small>

diff --git a/app/views/mailer/issue_add.text.plain.rhtml b/app/views/mailer/issue_add.text.plain.rhtml
index a9aa13b3de0f090e3435f4fbd800f02ac0ea00ff..a5740ad89a0930989e89455bb9699660365db5f6 100644 (file)
--- a/app/views/mailer/issue_add.text.plain.rhtml
+++ b/app/views/mailer/issue_add.text.plain.rhtml
@@ -1,3 +1,5 @@
 <%= l(:text_issue_added, "##{@issue.id}") %>
 ----------------------------------------
 <%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %>
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/issue_edit.text.html.rhtml b/app/views/mailer/issue_edit.text.html.rhtml
index 59c767c9f1c04cc7c1c3011cbff5bbb260bee8f3..fddd194311d82c4ad14672c8922648cb4e8e4a65 100644 (file)
--- a/app/views/mailer/issue_edit.text.html.rhtml
+++ b/app/views/mailer/issue_edit.text.html.rhtml
@@ -8,3 +8,5 @@
 <%= textilizable(@journal.notes) %>
 <hr />
 <%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %>
+<hr />
+<small><em><%= textilizable Setting.emails_footer %></em></small>

diff --git a/app/views/mailer/issue_edit.text.plain.rhtml b/app/views/mailer/issue_edit.text.plain.rhtml
index 4431d46d5f911d9b7d40a60054895f5097098e23..4ecc3754942577688951df5229eaedd2238c1bb8 100644 (file)
--- a/app/views/mailer/issue_edit.text.plain.rhtml
+++ b/app/views/mailer/issue_edit.text.plain.rhtml
@@ -6,3 +6,5 @@
 <%= @journal.notes if @journal.notes? %>
 ----------------------------------------
 <%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %>
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/lost_password.rhtml b/app/views/mailer/lost_password.rhtml
index ea2e58abbdc8b9fa39b018a2c7d8db85e902f38a..5b5bb3b904763371e830e592a14fa827438dc747 100644 (file)
--- a/app/views/mailer/lost_password.rhtml
+++ b/app/views/mailer/lost_password.rhtml
@@ -1,2 +1,5 @@
 <%= l(:mail_body_lost_password) %>
 <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %>
+
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/message_posted.rhtml b/app/views/mailer/message_posted.rhtml
deleted file mode 100644 (file)
index 10b46c4..0000000
--- a/app/views/mailer/message_posted.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= l(:field_author) %>: <%= @message.author.name %>
-<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'messages', :action => 'show', :board_id => @message.board_id, :id => @message.root %>
-
-<%= @message.content %>

diff --git a/app/views/mailer/message_posted.text.html.rhtml b/app/views/mailer/message_posted.text.html.rhtml
new file mode 100644 (file)
index 0000000..89346e7
--- /dev/null
+++ b/app/views/mailer/message_posted.text.html.rhtml
@@ -0,0 +1,6 @@
+<%=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 />
+<em><%= @message.author.name %></em>
+
+<%= textilizable @message.content %>
+<hr />
+<small><em><%= textilizable Setting.emails_footer %></em></small>

diff --git a/app/views/mailer/message_posted.text.plain.rhtml b/app/views/mailer/message_posted.text.plain.rhtml
new file mode 100644 (file)
index 0000000..97539fd
--- /dev/null
+++ b/app/views/mailer/message_posted.text.plain.rhtml
@@ -0,0 +1,6 @@
+<%= url_for :only_path => false, :host => Setting.host_name, :controller => 'messages', :action => 'show', :board_id => @message.board_id, :id => @message.root %>
+<%= @message.author.name %>
+
+<%= @message.content %>
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/news_added.text.html.rhtml b/app/views/mailer/news_added.text.html.rhtml
index 7de6f48e8beb13cee9e2b0009018967a4bd7a57b..e99dfd5bcd35b83cd7dc5eac2bcfd50f36289b7c 100644 (file)
--- a/app/views/mailer/news_added.text.html.rhtml
+++ b/app/views/mailer/news_added.text.html.rhtml
@@ -2,3 +2,5 @@
 <em><%= @news.author.name %></em>
 
 <%= textilizable(@news.description) %>
+<hr />
+<small><em><%= textilizable Setting.emails_footer %></em></small>

diff --git a/app/views/mailer/news_added.text.plain.rhtml b/app/views/mailer/news_added.text.plain.rhtml
index 7ee24b10a8cb43ad2f87c0f2220fdc7a963bd8aa..1a04af9ca766d99bf4a6e7098e2e236abb25354b 100644 (file)
--- a/app/views/mailer/news_added.text.plain.rhtml
+++ b/app/views/mailer/news_added.text.plain.rhtml
@@ -3,3 +3,5 @@
 <%= @news.author.name %>
 
 <%= @news.description %>
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/register.rhtml b/app/views/mailer/register.rhtml
index 7e4f95f465279cb130aef90c21fdf7c3b8b7f65e..55fcf1e1030af81e7d08357ed12c28ef8bbef4e8 100644 (file)
--- a/app/views/mailer/register.rhtml
+++ b/app/views/mailer/register.rhtml
@@ -1,2 +1,5 @@
 <%= l(:mail_body_register) %>
 <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %>
+
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/app/views/mailer/test.rhtml b/app/views/mailer/test.rhtml
deleted file mode 100644 (file)
index deffa53..0000000
--- a/app/views/mailer/test.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a test email sent by Redmine.
-
-Redmine URL: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'welcome' %>

diff --git a/app/views/mailer/test.text.html.rhtml b/app/views/mailer/test.text.html.rhtml
new file mode 100644 (file)
index 0000000..f1cb188
--- /dev/null
+++ b/app/views/mailer/test.text.html.rhtml
@@ -0,0 +1,5 @@
+<p>This is a test email sent by Redmine.<br />
+Redmine URL: <%= link_to url_for(:only_path => false, :host => Setting.host_name, :controller => 'welcome'),
+                         url_for(:only_path => false, :host => Setting.host_name, :controller => 'welcome') %></p>
+<hr />
+<small><em><%= textilizable Setting.emails_footer %></em></small>

diff --git a/app/views/mailer/test.text.plain.rhtml b/app/views/mailer/test.text.plain.rhtml
new file mode 100644 (file)
index 0000000..0519caa
--- /dev/null
+++ b/app/views/mailer/test.text.plain.rhtml
@@ -0,0 +1,5 @@
+This is a test email sent by Redmine.
+Redmine URL: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'welcome' %>
+
+----------------------------------------
+<%= Setting.emails_footer %>

diff --git a/config/settings.yml b/config/settings.yml
index fbc9da20377034c5ca39092250da93778db6c7b1..ff695cc7cbacaaf699d6f7f2ce21ebc97b998327 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -96,4 +96,8 @@ repositories_encodings:
   default: ''
 ui_theme:
   default: ''
+emails_footer:
+  default: |-
+    You have received this notification because you have either subscribed to it, or are involved in.
+    To change your notification preferences, please click here: http://hostname/my/account
   
\ No newline at end of file

diff --git a/lang/bg.yml b/lang/bg.yml
index d4ef3511e344d922f2fc93ddb4c18f0b91c6a596..0b333e4880bb765fba0e1c9472c583837282352c 100644 (file)
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/cs.yml b/lang/cs.yml
index b7b88884d4aeba128404d9a148c5bab78c1c2076..e947b1172342a03b194db55e00ff0c55d14312e5 100644 (file)
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/de.yml b/lang/de.yml
index 793876fc355bf17c5df1e3aa07cf85731f122c94..93190fb7385eb8e7a06e95083902855f664f35ce 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/en.yml b/lang/en.yml
index d0dc646660b35c27c091ac1081d8b26dd532a7b5..88cbcd73036e5e291b686b229a180fe40f86e335 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -188,6 +188,7 @@ setting_date_format: Date format
 setting_cross_project_issue_relations: Allow cross-project issue relations
 setting_issue_list_default_columns: Default columns displayed on the issue list
 setting_repositories_encodings: Repositories encodings
+setting_emails_footer: Emails footer
 
 label_user: User
 label_user_plural: Users

diff --git a/lang/es.yml b/lang/es.yml
index d66220e05c60068408785938a74ccafd0d553455..f55d5849e4e9eb2c9745750b517ca04bf3ca29c2 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -534,3 +534,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/fr.yml b/lang/fr.yml
index ce543b6862bffac6f75120194b4ce1718d12299c..70b60368739415c8f38f437d86348c6745954423 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -188,6 +188,7 @@ setting_date_format: Format de date
 setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
 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
 
 label_user: Utilisateur
 label_user_plural: Utilisateurs

diff --git a/lang/he.yml b/lang/he.yml
index 0a310924a51d920fa74ec48952ea121bc1a9672c..8cefd127f40bb23980dd59e5833ae29383cc8892 100644 (file)
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/it.yml b/lang/it.yml
index b4888808f97c830a49ed450c9b245edce7d9a05e..840d298f75a6a126bd8916fc86bd221f52161d59 100644 (file)
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/ja.yml b/lang/ja.yml
index 3016d385bcbfb0ea861ff5730ea47112e0ddc7e5..fc42cee5243cbcfb79d7b22d32f952ecbcf0fb99 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -532,3 +532,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/nl.yml b/lang/nl.yml
index 9b7d73a9d1698ae963a761ee79c597f3a89fdafb..fc6d9bbebb8d99a64979ab1562e1be6119ce7614 100644 (file)
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -532,3 +532,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/pl.yml b/lang/pl.yml
index 1b8602abbb31461ddff7011e7fbb921403c89f24..4565b257653794018ade2992fc649b962225abb0 100644 (file)
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index da25974ad0ac3febbf2edc7937cf6bea9c9d4610..942de55aee7e9fa2b9c77f660b8d516f4e3f8538 100644 (file)
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."\r
 label_user_mail_option_all: "For any event on all my projects"\r
 label_user_mail_option_none: "Only for things I watch or I'm involved in"\r
+setting_emails_footer: Emails footer\r

diff --git a/lang/pt.yml b/lang/pt.yml
index 94dace1d9621030e4199c64ea3ec70220c0144e0..49176d6070262488c633ca5894d2048294b509a0 100644 (file)
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/ro.yml b/lang/ro.yml
index 93352c8c9d144d128c53766da9c35a9366ecc271..8e7b8a2bf60628793cce597ba3487e55c6a3db4f 100644 (file)
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -531,3 +531,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/sv.yml b/lang/sv.yml
index 139105ed45660b5b87a7a5b915c16c63114d7057..878eb144108d8bbf0723bf4c5d8c5e5ec8c065d9 100644 (file)
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -532,3 +532,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer

diff --git a/lang/zh.yml b/lang/zh.yml
index 9fda045b8dcb2de38b6d0ce327d1bac85a9d4043..34e56ea375d685fdc2240831b0d1dde38d3c4949 100644 (file)
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -534,3 +534,4 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
+setting_emails_footer: Emails footer