diff options
| author | Alban Peignier | 2017-12-14 12:04:19 +0100 |
|---|---|---|
| committer | Alban Peignier | 2017-12-14 12:04:19 +0100 |
| commit | 1eacdd594ec0079372c7e8d0c32d283e2a20a05c (patch) | |
| tree | cc9894f01798b73a588d3a3b2dc22ea720bf9048 /config | |
| parent | 0d6dd2459c805558a6b941c8311a990be76a67e7 (diff) | |
| download | chouette-core-1eacdd594ec0079372c7e8d0c32d283e2a20a05c.tar.bz2 | |
Refactor mailer layout. Refs #5303
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 3 | ||||
| -rw-r--r-- | config/locales/devise.fr.yml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 56773d81e..e9cd16c34 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -36,9 +36,10 @@ Rails.application.configure do # config.action_view.raise_on_missing_translations = true #config.active_record.auto_explain_threshold_in_seconds = (RUBY_PLATFORM == "java" ? nil : 0.5) - config.action_mailer.default_url_options = { :host => 'localhost:3000' } + config.action_mailer.default_url_options = { :host => ENV.fetch('RAILS_HOST', 'http://localhost:3000') } config.action_mailer.default_options = { from: 'Stif BOIV <stif-boiv@af83.com>' } config.action_mailer.delivery_method = :letter_opener + config.action_mailer.asset_host = ENV.fetch('RAILS_HOST', 'http://localhost:3000') # change to true to allow email to be sent during development config.action_mailer.perform_deliveries = true diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml index d3fd6d03e..42a568fec 100644 --- a/config/locales/devise.fr.yml +++ b/config/locales/devise.fr.yml @@ -31,7 +31,7 @@ norme Neptune (NFP 99 506)" passwords: new: title: Mot de passe oublié - commit: Envoyer les instructions pour un nouveau mot de passe + commit: Envoyer les instructions edit: title: Changer de mot de passe new_password: Nouveau mot de passe |