changes unfinished

This commit is contained in:
2013-01-17 10:28:05 +01:00
parent 730768cb59
commit db1a6ac96b
13 changed files with 88 additions and 13 deletions
+7
View File
@@ -75,6 +75,13 @@ module Qwaiter
config.assets.precompile += ['supplier/application.css', 'user/application.css', 'qr_sheet/application.css']
config.default_url_options = {format: 'html'}
config.to_prepare do
Devise::Mailer.layout "mail"
Devise::Mailer.class_eval do
helper :mail
end
end
#config.middleware.use Rack::Cors do
# allow do
# origins '*'
+3
View File
@@ -50,6 +50,9 @@ Qwaiter::Application.configure do
# Disable delivery errors, bad email addresses will be ignored
config.action_mailer.raise_delivery_errors = false
config.action_mailer.default_url_options = {
host: 'www.qwaiter.com'
}
config.action_mailer.smtp_settings = {
address: "smtp.gmail.com",
port: 587,
+3
View File
@@ -27,6 +27,9 @@ Qwaiter::Application.configure do
# Tell Action Mailer not to deliver emails to the real world.
# The :test delivery method accumulates sent emails in the
# ActionMailer::Base.deliveries array.
config.action_mailer.default_url_options = {
host: 'www.qwaiter.com'
}
config.action_mailer.delivery_method = :test
# Raise exception on mass assignment protection for Active Record models
+1 -1
View File
@@ -4,7 +4,7 @@ Devise.setup do |config|
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
config.mailer_sender = 'Qwaiter <service@qwaiter.com>'
# Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer"
+3 -3
View File
@@ -36,10 +36,10 @@ nl:
forgot_password: Wachtwoord vergeten?
send_instructions_button: Stuur mij reset instructies
confirmations:
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
confirmed: 'Your account was successfully confirmed. You are now signed in.'
send_instructions: 'Er wordt een een e-mail naar je toe gestuurd waarin je je account kan bevestigen.'
confirmed: 'De activatie van je account is successvol. Je bent nu aangemeld!'
did_not_receive_instructions_link: "Heeft u geen bevestigingsinstructies ontvangen?"
did_not_receive: Heeft u geen bevestigingsinstructies ontvangen?
did_not_receive: 'Heeft u geen bevestigingsinstructies ontvangen?'
registrations:
title: Aanmelden
button: Aanmelden
+6
View File
@@ -0,0 +1,6 @@
nl:
mailer:
supplier:
creation:
subject: 'Weklom bij Qwaiter'
title: 'De aanmelding van %{name} bij Qwaiter is gelukt!'