Pārlūkot izejas kodu

Fix i18n fallback configuration conflicts with environment configurations (#6843)

master
Akihiko Odaki pirms 6 gadiem
committed by Eugen Rochko
vecāks
revīzija
61dcb686a8
2 mainītis faili ar 3 papildinājumiem un 5 dzēšanām
  1. +1
    -3
      config/application.rb
  2. +2
    -2
      config/environments/production.rb

+ 1
- 3
config/application.rb Parādīt failu

@@ -76,9 +76,7 @@ module Mastodon
]

config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym
if config.i18n.available_locales.include?(config.i18n.default_locale)
config.i18n.fallbacks = [:en]
else
unless config.i18n.available_locales.include?(config.i18n.default_locale)
config.i18n.default_locale = :en
end



+ 2
- 2
config/environments/production.rb Parādīt failu

@@ -55,8 +55,8 @@ Rails.application.configure do
# 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
# English when a translation cannot be found).
config.i18n.fallbacks = [:en]

# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify


Notiek ielāde…
Atcelt
Saglabāt