Skip to content

locales with countries like en_GB or or en_US have the langauge at lo… #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoanMartinezRipoll wants to merge 1 commit into
base: master
Choose a base branch
from
Open

locales with countries like en_GB or or en_US have the langauge at lo… #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/generators/foxinator/setup/templates/cms/app/controllers/concerns/localizify.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ def accept_locale
if request.env['HTTP_ACCEPT_LANGUAGE'].present?
parsed_locale = request.env['HTTP_ACCEPT_LANGUAGE'].gsub(/\s+/, '').split(',').first
parsed_locale = parsed_locale.scan(/^[a-z]{2}-[a-z]{2}|[a-z]{2}/i).first if parsed_locale
parsed_locale = parsed_locale.split('-').last.try(:downcase).try(:to_sym) if parsed_locale
parsed_locale = parsed_locale.split('-').first.try(:downcase).try(:to_sym) if parsed_locale
Copy link
Contributor

@itschn itschn Oct 8, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The given example shows a locale with an underscore, but the code is splitting by dash. maybe it's better to split by both. Like:

parsed_locale.split(Regexp.new('-|_')).first


locale_available?(parsed_locale) ? parsed_locale.try(:to_sym) : nil
end
end
Expand Down