Fix i18n fallbacks
Fallbacks are set in config/initializers/locale.rb and this settings conflicts with the fallbacks set there. Fixes #7860 closes #7861
This commit is contained in:
parent
65a2b8da12
commit
49b63693c9
2 changed files with 1 additions and 4 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue