@@ -0,0 +1,6 | |||||
|
1 | <%=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 /> | |||
|
2 | <em><%= @message.author.name %></em> | |||
|
3 | ||||
|
4 | <%= textilizable @message.content %> | |||
|
5 | <hr /> | |||
|
6 | <small><em><%= textilizable Setting.emails_footer %></em></small> |
@@ -0,0 +1,5 | |||||
|
1 | <p>This is a test email sent by Redmine.<br /> | |||
|
2 | Redmine URL: <%= link_to url_for(:only_path => false, :host => Setting.host_name, :controller => 'welcome'), | |||
|
3 | url_for(:only_path => false, :host => Setting.host_name, :controller => 'welcome') %></p> | |||
|
4 | <hr /> | |||
|
5 | <small><em><%= textilizable Setting.emails_footer %></em></small> |
@@ -49,6 +49,7 class AdminController < ApplicationController | |||||
49 | @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted) |
|
49 | @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted) | |
50 | if request.post? |
|
50 | if request.post? | |
51 | Setting.notified_events = (params[:notified_events] || []) |
|
51 | Setting.notified_events = (params[:notified_events] || []) | |
|
52 | Setting.emails_footer = params[:emails_footer] if params[:emails_footer] | |||
52 | flash[:notice] = l(:notice_successful_update) |
|
53 | flash[:notice] = l(:notice_successful_update) | |
53 | redirect_to :controller => 'admin', :action => 'mail_options' |
|
54 | redirect_to :controller => 'admin', :action => 'mail_options' | |
54 | end |
|
55 | end |
@@ -8,12 +8,15 | |||||
8 |
|
8 | |||
9 | <fieldset class="box"><legend><%=l(:text_select_mail_notifications)%></legend> |
|
9 | <fieldset class="box"><legend><%=l(:text_select_mail_notifications)%></legend> | |
10 | <% @notifiables.each do |notifiable| %> |
|
10 | <% @notifiables.each do |notifiable| %> | |
11 |
|
|
11 | <label><%= check_box_tag "notified_events[]", notifiable, Setting.notified_events.include?(notifiable) %> | |
12 |
<%= notifiable.humanize %></label></ |
|
12 | <%= notifiable.humanize %></label><br /> | |
13 | <% end %> |
|
13 | <% end %> | |
14 | <div class="clear"></div> |
|
14 | <p><%= check_all_links('mail-options-form') %></p> | |
|
15 | </fieldset> | |||
|
16 | ||||
|
17 | <fieldset class="box"><legend>Emails footer</legend> | |||
|
18 | <%= text_area_tag 'emails_footer', Setting.emails_footer, :class => 'wiki-edit', :rows => 5 %> | |||
15 | </fieldset> |
|
19 | </fieldset> | |
16 |
|
20 | |||
17 | <p><%= check_all_links('mail-options-form') %></p> |
|
|||
18 | <%= submit_tag l(:button_save) %> |
|
21 | <%= submit_tag l(:button_save) %> | |
19 | <% end %> |
|
22 | <% end %> |
@@ -7,3 +7,6 Log in: <%= url_for :only_path => false, :host => Setting.host_name, :controller | |||||
7 | <% unless @user.auth_source %> |
|
7 | <% unless @user.auth_source %> | |
8 | You can change your password here: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %> |
|
8 | You can change your password here: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %> | |
9 | <% end %> |
|
9 | <% end %> | |
|
10 | ||||
|
11 | ---------------------------------------- | |||
|
12 | <%= Setting.emails_footer %> |
@@ -7,3 +7,6 Pour se connecter à l'application: <%= url_for :only_path => false, :host => Se | |||||
7 | <% unless @user.auth_source %> |
|
7 | <% unless @user.auth_source %> | |
8 | Vous pouvez changer votre mot de passe à l'adresse: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %> |
|
8 | Vous pouvez changer votre mot de passe à l'adresse: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %> | |
9 | <% end %> |
|
9 | <% end %> | |
|
10 | ||||
|
11 | ---------------------------------------- | |||
|
12 | <%= Setting.emails_footer %> |
@@ -7,3 +7,6 Zaloguj: <%= url_for :only_path => false, :host => Setting.host_name, :controlle | |||||
7 | <% unless @user.auth_source %> |
|
7 | <% unless @user.auth_source %> | |
8 | Możesz zmienić swoje hasło tutaj: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %> |
|
8 | Możesz zmienić swoje hasło tutaj: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %> | |
9 | <% end %> |
|
9 | <% end %> | |
|
10 | ||||
|
11 | ---------------------------------------- | |||
|
12 | <%= Setting.emails_footer %> |
@@ -3,3 +3,5 | |||||
3 | <ul><% @attachments.each do |attachment | %> |
|
3 | <ul><% @attachments.each do |attachment | %> | |
4 | <li><%= attachment.filename %></li> |
|
4 | <li><%= attachment.filename %></li> | |
5 | <% end %></ul> |
|
5 | <% end %></ul> | |
|
6 | <hr /> | |||
|
7 | <small><em><%= textilizable Setting.emails_footer %></em></small> |
@@ -2,3 +2,5 | |||||
2 | - <%= attachment.filename %><% end %> |
|
2 | - <%= attachment.filename %><% end %> | |
3 |
|
3 | |||
4 | <%= url_for @url %> |
|
4 | <%= url_for @url %> | |
|
5 | ---------------------------------------- | |||
|
6 | <%= Setting.emails_footer %> |
@@ -2,3 +2,5 | |||||
2 | (<%= @document.category.name %>)<br /> |
|
2 | (<%= @document.category.name %>)<br /> | |
3 | <br /> |
|
3 | <br /> | |
4 | <%= textilizable(@document.description) %> |
|
4 | <%= textilizable(@document.description) %> | |
|
5 | <hr /> | |||
|
6 | <small><em><%= textilizable Setting.emails_footer %></em></small> |
@@ -2,3 +2,5 | |||||
2 | <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> |
|
2 | <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'documents', :action => 'show', :id => @document %> | |
3 |
|
3 | |||
4 | <%= @document.description %> |
|
4 | <%= @document.description %> | |
|
5 | ---------------------------------------- | |||
|
6 | <%= Setting.emails_footer %> |
@@ -1,3 +1,5 | |||||
1 | <%= l(:text_issue_added, "##{@issue.id}") %> |
|
1 | <%= l(:text_issue_added, "##{@issue.id}") %> | |
2 | <hr /> |
|
2 | <hr /> | |
3 | <%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %> |
|
3 | <%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %> | |
|
4 | <hr /> | |||
|
5 | <small><em><%= textilizable Setting.emails_footer %></em></small> |
@@ -1,3 +1,5 | |||||
1 | <%= l(:text_issue_added, "##{@issue.id}") %> |
|
1 | <%= l(:text_issue_added, "##{@issue.id}") %> | |
2 | ---------------------------------------- |
|
2 | ---------------------------------------- | |
3 | <%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %> |
|
3 | <%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %> | |
|
4 | ---------------------------------------- | |||
|
5 | <%= Setting.emails_footer %> |
@@ -8,3 +8,5 | |||||
8 | <%= textilizable(@journal.notes) %> |
|
8 | <%= textilizable(@journal.notes) %> | |
9 | <hr /> |
|
9 | <hr /> | |
10 | <%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %> |
|
10 | <%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue } %> | |
|
11 | <hr /> | |||
|
12 | <small><em><%= textilizable Setting.emails_footer %></em></small> |
@@ -6,3 +6,5 | |||||
6 | <%= @journal.notes if @journal.notes? %> |
|
6 | <%= @journal.notes if @journal.notes? %> | |
7 | ---------------------------------------- |
|
7 | ---------------------------------------- | |
8 | <%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %> |
|
8 | <%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue } %> | |
|
9 | ---------------------------------------- | |||
|
10 | <%= Setting.emails_footer %> |
@@ -1,2 +1,5 | |||||
1 | <%= l(:mail_body_lost_password) %> |
|
1 | <%= l(:mail_body_lost_password) %> | |
2 | <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> |
|
2 | <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'lost_password', :token => @token.value %> | |
|
3 | ||||
|
4 | ---------------------------------------- | |||
|
5 | <%= Setting.emails_footer %> |
@@ -1,4 +1,6 | |||||
1 | <%= l(:field_author) %>: <%= @message.author.name %> |
|
|||
2 | <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'messages', :action => 'show', :board_id => @message.board_id, :id => @message.root %> |
|
1 | <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'messages', :action => 'show', :board_id => @message.board_id, :id => @message.root %> | |
|
2 | <%= @message.author.name %> | |||
3 |
|
3 | |||
4 | <%= @message.content %> |
|
4 | <%= @message.content %> | |
|
5 | ---------------------------------------- | |||
|
6 | <%= Setting.emails_footer %> |
@@ -2,3 +2,5 | |||||
2 | <em><%= @news.author.name %></em> |
|
2 | <em><%= @news.author.name %></em> | |
3 |
|
3 | |||
4 | <%= textilizable(@news.description) %> |
|
4 | <%= textilizable(@news.description) %> | |
|
5 | <hr /> | |||
|
6 | <small><em><%= textilizable Setting.emails_footer %></em></small> |
@@ -3,3 +3,5 | |||||
3 | <%= @news.author.name %> |
|
3 | <%= @news.author.name %> | |
4 |
|
4 | |||
5 | <%= @news.description %> |
|
5 | <%= @news.description %> | |
|
6 | ---------------------------------------- | |||
|
7 | <%= Setting.emails_footer %> |
@@ -1,2 +1,5 | |||||
1 | <%= l(:mail_body_register) %> |
|
1 | <%= l(:mail_body_register) %> | |
2 | <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> |
|
2 | <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'register', :token => @token.value %> | |
|
3 | ||||
|
4 | ---------------------------------------- | |||
|
5 | <%= Setting.emails_footer %> |
@@ -1,3 +1,5 | |||||
1 | This is a test email sent by Redmine. |
|
1 | This is a test email sent by Redmine. | |
2 |
|
||||
3 | Redmine URL: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'welcome' %> |
|
2 | Redmine URL: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'welcome' %> | |
|
3 | ||||
|
4 | ---------------------------------------- | |||
|
5 | <%= Setting.emails_footer %> |
@@ -96,4 +96,8 repositories_encodings: | |||||
96 | default: '' |
|
96 | default: '' | |
97 | ui_theme: |
|
97 | ui_theme: | |
98 | default: '' |
|
98 | default: '' | |
|
99 | emails_footer: | |||
|
100 | default: |- | |||
|
101 | You have received this notification because you have either subscribed to it, or are involved in. | |||
|
102 | To change your notification preferences, please click here: http://hostname/my/account | |||
99 | No newline at end of file |
|
103 |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -188,6 +188,7 setting_date_format: Date format | |||||
188 | setting_cross_project_issue_relations: Allow cross-project issue relations |
|
188 | setting_cross_project_issue_relations: Allow cross-project issue relations | |
189 | setting_issue_list_default_columns: Default columns displayed on the issue list |
|
189 | setting_issue_list_default_columns: Default columns displayed on the issue list | |
190 | setting_repositories_encodings: Repositories encodings |
|
190 | setting_repositories_encodings: Repositories encodings | |
|
191 | setting_emails_footer: Emails footer | |||
191 |
|
192 | |||
192 | label_user: User |
|
193 | label_user: User | |
193 | label_user_plural: Users |
|
194 | label_user_plural: Users |
@@ -534,3 +534,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
534 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
534 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
535 | label_user_mail_option_all: "For any event on all my projects" |
|
535 | label_user_mail_option_all: "For any event on all my projects" | |
536 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
536 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
537 | setting_emails_footer: Emails footer |
@@ -188,6 +188,7 setting_date_format: Format de date | |||||
188 | setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets |
|
188 | setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets | |
189 | setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes |
|
189 | setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes | |
190 | setting_repositories_encodings: Encodages des dépôts |
|
190 | setting_repositories_encodings: Encodages des dépôts | |
|
191 | setting_emails_footer: Pied-de-page des emails | |||
191 |
|
192 | |||
192 | label_user: Utilisateur |
|
193 | label_user: Utilisateur | |
193 | label_user_plural: Utilisateurs |
|
194 | label_user_plural: Utilisateurs |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -532,3 +532,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
532 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
532 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
533 | label_user_mail_option_all: "For any event on all my projects" |
|
533 | label_user_mail_option_all: "For any event on all my projects" | |
534 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
534 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
535 | setting_emails_footer: Emails footer |
@@ -532,3 +532,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
532 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
532 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
533 | label_user_mail_option_all: "For any event on all my projects" |
|
533 | label_user_mail_option_all: "For any event on all my projects" | |
534 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
534 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
535 | setting_emails_footer: Emails footer |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -531,3 +531,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
531 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
531 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
532 | label_user_mail_option_all: "For any event on all my projects" |
|
532 | label_user_mail_option_all: "For any event on all my projects" | |
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
533 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
534 | setting_emails_footer: Emails footer |
@@ -532,3 +532,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
532 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
532 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
533 | label_user_mail_option_all: "For any event on all my projects" |
|
533 | label_user_mail_option_all: "For any event on all my projects" | |
534 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
534 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
535 | setting_emails_footer: Emails footer |
@@ -534,3 +534,4 text_user_mail_option: "For unselected projects, you will only receive notificat | |||||
534 | label_user_mail_option_selected: "For any event on the selected projects only..." |
|
534 | label_user_mail_option_selected: "For any event on the selected projects only..." | |
535 | label_user_mail_option_all: "For any event on all my projects" |
|
535 | label_user_mail_option_all: "For any event on all my projects" | |
536 | label_user_mail_option_none: "Only for things I watch or I'm involved in" |
|
536 | label_user_mail_option_none: "Only for things I watch or I'm involved in" | |
|
537 | setting_emails_footer: Emails footer |
General Comments 0
You need to be logged in to leave comments.
Login now