| @@ -39,6 +39,9 class SettingsController < ApplicationController | |||
|
|
39 | 39 | @options = {} |
|
|
40 | 40 | @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] } |
|
|
41 | 41 | @deliveries = ActionMailer::Base.perform_deliveries |
|
|
42 | ||
|
|
43 | @guessed_host_and_path = request.host_with_port | |
|
|
44 | @guessed_host_and_path << ('/'+ request.relative_url_root.gsub(%r{^\/}, '')) unless request.relative_url_root.blank? | |
|
|
42 | 45 | end |
|
|
43 | 46 | |
|
|
44 | 47 | def plugin |
| @@ -185,6 +185,7 class Mailer < ActionMailer::Base | |||
|
|
185 | 185 | from Setting.mail_from |
|
|
186 | 186 | default_url_options[:host] = Setting.host_name |
|
|
187 | 187 | default_url_options[:protocol] = Setting.protocol |
|
|
188 | default_url_options[:skip_relative_url_root] = true | |
|
|
188 | 189 | # Common headers |
|
|
189 | 190 | headers 'X-Mailer' => 'Redmine', |
|
|
190 | 191 | 'X-Redmine-Host' => Setting.host_name, |
| @@ -33,7 +33,8 | |||
|
|
33 | 33 | <%= text_field_tag 'settings[activity_days_default]', Setting.activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p> |
|
|
34 | 34 | |
|
|
35 | 35 | <p><label><%= l(:setting_host_name) %></label> |
|
|
36 |
<%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></ |
|
|
|
36 | <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %><br /> | |
|
|
37 | <em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p> | |
|
|
37 | 38 | |
|
|
38 | 39 | <p><label><%= l(:setting_protocol) %></label> |
|
|
39 | 40 | <%= select_tag 'settings[protocol]', options_for_select(['http', 'https'], Setting.protocol) %></p> |
| @@ -196,7 +196,7 setting_issues_export_limit: Issues export limit | |||
|
|
196 | 196 | setting_mail_from: Emission email address |
|
|
197 | 197 | setting_bcc_recipients: Blind carbon copy recipients (bcc) |
|
|
198 | 198 | setting_plain_text_mail: plain text mail (no HTML) |
|
|
199 | setting_host_name: Host name | |
|
|
199 | setting_host_name: Host name and path | |
|
|
200 | 200 | setting_text_formatting: Text formatting |
|
|
201 | 201 | setting_wiki_compression: Wiki history compression |
|
|
202 | 202 | setting_feeds_limit: Feed content limit |
| @@ -576,6 +576,7 label_planning: Planning | |||
|
|
576 | 576 | label_incoming_emails: Incoming emails |
|
|
577 | 577 | label_generate_key: Generate a key |
|
|
578 | 578 | label_issue_watchers: Watchers |
|
|
579 | label_example: Example | |
|
|
579 | 580 | |
|
|
580 | 581 | button_login: Login |
|
|
581 | 582 | button_submit: Submit |
| @@ -197,7 +197,7 setting_issues_export_limit: Limite export demandes | |||
|
|
197 | 197 | setting_mail_from: Adresse d'émission |
|
|
198 | 198 | setting_bcc_recipients: Destinataires en copie cachée (cci) |
|
|
199 | 199 | setting_plain_text_mail: Mail texte brut (non HTML) |
|
|
200 | setting_host_name: Nom d'hôte | |
|
|
200 | setting_host_name: Nom d'hôte et chemin | |
|
|
201 | 201 | setting_text_formatting: Formatage du texte |
|
|
202 | 202 | setting_wiki_compression: Compression historique wiki |
|
|
203 | 203 | setting_feeds_limit: Limite du contenu des flux RSS |
| @@ -576,6 +576,7 label_planning: Planning | |||
|
|
576 | 576 | label_incoming_emails: Emails entrants |
|
|
577 | 577 | label_generate_key: Générer une clé |
|
|
578 | 578 | label_issue_watchers: Utilisateurs surveillant cette demande |
|
|
579 | label_example: Exemple | |
|
|
579 | 580 | |
|
|
580 | 581 | button_login: Connexion |
|
|
581 | 582 | button_submit: Soumettre |
General Comments 0
You need to be logged in to leave comments.
Login now