mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-11 21:29:09 +09:00
f5cd138323
* Add locale spec with failing locale plus region check * Use a more accurate locale when supplied by browser headers Previously we were using a matching option which would use the first locale available which matched the locale portion, even if a region was specified. This changes to first try to find an exact match, and then fall back to the region, and then fall back to the default. * Clean up default_locale method
38 lines
664 B
Ruby
38 lines
664 B
Ruby
# frozen_string_literal: true
|
|
|
|
module Localized
|
|
extend ActiveSupport::Concern
|
|
|
|
included do
|
|
around_action :set_locale
|
|
end
|
|
|
|
private
|
|
|
|
def set_locale
|
|
locale = default_locale
|
|
|
|
if user_signed_in?
|
|
begin
|
|
locale = current_user.try(:locale) || default_locale
|
|
rescue I18n::InvalidLocale
|
|
locale = default_locale
|
|
end
|
|
end
|
|
|
|
I18n.with_locale(locale) do
|
|
yield
|
|
end
|
|
end
|
|
|
|
def default_locale
|
|
ENV.fetch('DEFAULT_LOCALE') {
|
|
user_supplied_locale || I18n.default_locale
|
|
}
|
|
end
|
|
|
|
def user_supplied_locale
|
|
http_accept_language.language_region_compatible_from(I18n.available_locales)
|
|
end
|
|
end
|