From e0a0ef3f911bff9fd50186a183039bf8917d3376 Mon Sep 17 00:00:00 2001 From: nightpool Date: Mon, 12 Mar 2018 18:41:31 -0400 Subject: [PATCH] fix locale update for 2.3.x --- config/application.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/application.rb b/config/application.rb index c7c299216..6780c57fe 100644 --- a/config/application.rb +++ b/config/application.rb @@ -88,9 +88,11 @@ module Mastodon ] config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym - - unless config.i18n.available_locales.include?(config.i18n.default_locale) + if config.i18n.available_locales.include?(config.i18n.default_locale) + config.i18n.fallbacks = [:en] + else config.i18n.default_locale = :'en-CY' + config.i18n.fallbacks = [:en] end # config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')