diff options
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 150fdce6c..e1f7ae707 100644 --- a/config/application.rb +++ b/config/application.rb @@ -10,10 +10,12 @@ require_relative '../app/lib/exceptions' require_relative '../lib/paperclip/lazy_thumbnail' require_relative '../lib/paperclip/gif_transcoder' require_relative '../lib/paperclip/video_transcoder' -require_relative '../lib/paperclip/audio_transcoder' +require_relative '../lib/paperclip/type_corrector' require_relative '../lib/mastodon/snowflake' require_relative '../lib/mastodon/version' -require_relative '../lib/devise/ldap_authenticatable' +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 @@ -37,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, @@ -49,8 +51,11 @@ module Mastodon :da, :de, :el, + :en, :eo, + :'es-AR', :es, + :et, :eu, :fa, :fi, @@ -68,29 +73,35 @@ module Mastodon :ja, :ka, :kk, + :kn, :ko, :lt, :lv, + :mk, + :ml, + :mr, :ms, :nl, + :nn, :no, :oc, :pl, - :pt, :'pt-BR', + :'pt-PT', :ro, :ru, :sk, :sl, :sq, - :sr, :'sr-Latn', + :sr, :sv, :ta, :te, :th, :tr, :uk, + :ur, :'zh-CN', :'zh-HK', :'zh-TW', @@ -114,6 +125,9 @@ module Mastodon Doorkeeper::AuthorizationsController.layout 'modal' Doorkeeper::AuthorizedApplicationsController.layout 'admin' Doorkeeper::Application.send :include, ApplicationExtension + Devise::FailureApp.send :include, AbstractController::Callbacks + Devise::FailureApp.send :include, HttpAcceptLanguage::EasyAccess + Devise::FailureApp.send :include, Localized end end end |