From 49b63693c9d7f74e738ccfc768eba6083562b33f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 7 Sep 2018 04:46:43 +0200 Subject: [PATCH] Fix i18n fallbacks Fallbacks are set in config/initializers/locale.rb and this settings conflicts with the fallbacks set there. Fixes #7860 closes #7861 --- Changelog.md | 1 + config/environments/production.rb | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index 22193e249..2919fb00c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ ## Bug fixes * Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830) * Fix comment and like notifications on posts without text [#7857](https://github.com/diaspora/diaspora/pull/7857) [#7853](https://github.com/diaspora/diaspora/pull/7853) +* Fix issue with some language fallbacks not working correctly [#7861](https://github.com/diaspora/diaspora/pull/7861) ## Features * Add `web+diaspora://` link handler [#7826](https://github.com/diaspora/diaspora/pull/7826) diff --git a/config/environments/production.rb b/config/environments/production.rb index ba2422b29..304613a67 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -74,10 +74,6 @@ Rails.application.configure do # Set this to true and configure the email server for immediate delivery to raise delivery errors. # config.action_mailer.raise_delivery_errors = false - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify