tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2022-02-19 11:33:18 +01:00
parent c8ef003c6b 2e89067d21
commit dc121b609f
215 changed files with 3330 additions and 1634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/concerns/authorization.rb
View File

@ -3,7 +3,7 @@
module Authorization
extend ActiveSupport::Concern
include Pundit
include Pundit::Authorization
def pundit_user
current_account

2
app/controllers/concerns/localized.rb
View File

@ -14,7 +14,7 @@ module Localized
private
def requested_locale
requested_locale_name = available_locale_or_nil(params[:locale])
requested_locale_name = available_locale_or_nil(params[:lang])
requested_locale_name ||= available_locale_or_nil(current_user.locale) if respond_to?(:user_signed_in?) && user_signed_in?
requested_locale_name ||= http_accept_language if ENV['DEFAULT_LOCALE'].blank?
requested_locale_name