diff options
| author | Reverite <github@reverite.sh> | 2019-10-05 12:13:22 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-10-05 12:13:22 -0700 |
| commit | 46ada47e09af0da9c776ef83c0ff034c720a83d6 (patch) | |
| tree | 54fd4b1d5fba6d592f328955ef5968608bbe716f /config/application.rb | |
| parent | 333b5e25f0a615a9518d402ef10dceb70190a52f (diff) | |
| parent | 3921125e5578fb3871fdcae0e8e8a77179f1ad72 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 3ced81b8f..9be41b1a7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -15,6 +15,7 @@ require_relative '../lib/mastodon/snowflake' require_relative '../lib/mastodon/version' require_relative '../lib/devise/two_factor_ldap_authenticatable' require_relative '../lib/devise/two_factor_pam_authenticatable' +require_relative '../lib/chewy/strategy/custom_sidekiq' Dotenv::Railtie.load @@ -38,11 +39,11 @@ module Mastodon # All translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.available_locales = [ - :en, :ar, :ast, :bg, :bn, + :br, :ca, :co, :cs, @@ -50,8 +51,11 @@ module Mastodon :da, :de, :el, + :en, :eo, + :'es-AR', :es, + :et, :eu, :fa, :fi, @@ -72,20 +76,22 @@ module Mastodon :ko, :lt, :lv, + :mk, :ms, :nl, + :nn, :no, :oc, :pl, - :'pt-PT', :'pt-BR', + :'pt-PT', :ro, :ru, :sk, :sl, :sq, - :sr, :'sr-Latn', + :sr, :sv, :ta, :te, |