Merge branch 'master' into features/publicity

# Conflicts: # .gitignore
2017-04-18 16:22:36 +02:00
parent 93dc7b0c50 cb1bf34588
commit 8cb8aea9ca
13 changed files with 11 additions and 81 deletions
@@ -74,8 +74,8 @@ Rails.application.configure do
  # Use default logging formatter so that PID and timestamp are not suppressed.
  config.log_formatter = ::Logger::Formatter.new

-  config.action_mailer.default_url_options = { host: 'ch420.herokuapp.com' }
-  config.action_mailer.asset_host = 'https://ch420.herokuapp.com'
+  config.action_mailer.default_url_options = { host: 'www.cannabis-initiative.ch' }
+  config.action_mailer.asset_host = 'https://www.cannabis-initiative.ch'

  config.action_mailer.delivery_method = :smtp
  config.action_mailer.smtp_settings = {
@@ -131,7 +131,6 @@ de:
        remember_me: Angemeldet bleiben
        password: Passwort
        language: Sprache
-        unsubscribed: Kein Newsletter
        password_confirmation: Passwort bestätigen
        current_password: Aktuelles Passwort
      publicity:
@@ -127,7 +127,6 @@ fr:
        remember_me: Se souvenir de moi
        password: mot de passe
        language: Langue
-        unsubscribed: pas de newslettre
        password_confirmation: confirmer le mot de passe
        current_password: Mot de passe actuel
      
@@ -128,7 +128,6 @@ it:
        remember_me: Ricordati di mel
        password: Password
        language: Lingua
-        unsubscribed: No Newsletter
        password_confirmation: conferma password
        current_password: Password corrente
      publicity: