Mailer and other upgrades

This commit is contained in:
2013-01-17 09:15:42 +01:00
parent 26810defcd
commit 730768cb59
36 changed files with 242 additions and 8 deletions
+15
View File
@@ -22,6 +22,21 @@ Qwaiter::Application.configure do
# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false
#config.action_mailer.delivery_method = :letter_opener
config.action_mailer.default_url_options = {
host: 'localhost',
port: 3000
}
config.action_mailer.smtp_settings = {
address: "smtp.gmail.com",
port: 587,
domain: "atool.nl",
authentication: :plain,
user_name: "bterkuile@companytools.nl",
password: "BjTKct22",
enable_starttls_auto: true
}
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
+10 -1
View File
@@ -49,7 +49,16 @@ Qwaiter::Application.configure do
# config.assets.precompile += %w( search.js )
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
config.action_mailer.raise_delivery_errors = false
config.action_mailer.smtp_settings = {
address: "smtp.gmail.com",
port: 587,
domain: "atool.nl",
authentication: :plain,
user_name: "bterkuile@companytools.nl",
password: "BjTKct22",
enable_starttls_auto: true
}
# Enable threaded mode
# config.threadsafe!
+2 -2
View File
@@ -182,11 +182,11 @@ Devise.setup do |config|
# Turn scoped views on. Before rendering "sessions/new", it will first check for
# "users/sessions/new". It's turned off by default because it's slower if you
# are using only default views.
# config.scoped_views = false
config.scoped_views = true
# Configure the default scope given to Warden. By default it's the first
# devise role declared in your routes (usually :user).
# config.default_scope = :user
config.default_scope = :supplier
# Configure sign_out behavior.
# Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
+1 -2
View File
@@ -43,14 +43,13 @@ nl:
registrations:
title: Aanmelden
button: Aanmelden
signed_up: 'Welcome! You have signed up successfully.'
signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
updated: 'You updated your account successfully.'
update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
signed_up: 'You have signed up successfully. If enabled, a confirmation was sent your e-mail.'
signed_up: 'Je hebt je succesvol aangemeld! Er wordt een bevestigingsmail toegestuurd'
updated: 'You updated your account successfully.'
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
sign_up: Acount aanvragen