diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-22 10:25:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 10:25:17 +0100 |
| commit | 89dab7c5341806c248b5ae005e5c96116c2279b6 (patch) | |
| tree | 9a76a7bae30d014bc59ab6b388a2685d0c7a4a50 /config | |
| parent | f9bd3d8808e4e83426913e5fbf18174b9121f3e4 (diff) | |
| parent | 1788164352db23917c540e42a839908ecc4e0463 (diff) | |
Merging code updates (Unlisted Mode)
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/production.rb | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.de.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.es.yml | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 27238e3d8..7f13fcf6b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -13,6 +13,7 @@ Rails.application.configure do # Full error reports are disabled and caching is turned on. config.consider_all_requests_local = false config.action_controller.perform_caching = true + config.action_controller.asset_host = ENV['CDN_HOST'] # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 6e6758df2..65714dbd5 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -15,6 +15,7 @@ de: note: Über mich password: Passwort username: Nutzername + silenced: Öffentliche Beiträge nicht auflisten notification_emails: favourite: E-mail senden, wenn jemand meinen Beitrag favorisiert follow: E-mail senden, wenn mir jemand folgt diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index b8a69a075..5b66fccd5 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -15,6 +15,7 @@ en: note: Bio password: Password username: Username + silenced: Unlisted mode notification_emails: favourite: Send e-mail when someone favourites your status follow: Send e-mail when someone follows you diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 1ac863b67..1909474a1 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -15,6 +15,7 @@ es: note: Biografía password: Contraseña username: Nombre de usuario + silenced: No listado notification_emails: favourite: Enviar correo electrónico cuando alguien de a favorito en su publicación follow: Enviar correo electrónico cuando alguien le siga |