Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Improve default language decision and spec (#3351)

Browse source 
* Improve default language decision

This change allows to takes account of accepted language determined by
the user agent even if the custom default locale of the instance is
configured.

* Cover Localized more

* Fix code style
This commit is contained in:
Akihiko Odaki (@fn_aki@pawoo.net) 2017-06-10 16:44:02 +09:00 • committed by Eugen Rochko
parent 2925372ff4
commit 4919b89ab8
2 changed files with 105 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/controllers/concerns/localized.rb
View file

@ -17,12 +17,24 @@ module Localized
end
def default_locale
ENV.fetch('DEFAULT_LOCALE') do
user_supplied_locale || I18n.default_locale
end
request_locale || env_locale || I18n.default_locale
end
def user_supplied_locale
http_accept_language.language_region_compatible_from(I18n.available_locales)
def env_locale
ENV['DEFAULT_LOCALE']
end
def request_locale
preferred_locale || compatible_locale
end
def preferred_locale
http_accept_language.preferred_language_from([env_locale]) ||
http_accept_language.preferred_language_from(I18n.available_locales)
end
def compatible_locale
http_accept_language.compatible_language_from([env_locale]) ||
http_accept_language.compatible_language_from(I18n.available_locales)
end
end