From f5cd1383231af6922dbab4f54b7d29eacfec9d9e Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 14 Apr 2017 19:12:39 -0400 Subject: Improve i18n chooser (#1804) * 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 --- spec/requests/localization_spec.rb | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 spec/requests/localization_spec.rb (limited to 'spec/requests/localization_spec.rb') diff --git a/spec/requests/localization_spec.rb b/spec/requests/localization_spec.rb new file mode 100644 index 000000000..d1b7bdc1d --- /dev/null +++ b/spec/requests/localization_spec.rb @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe 'Localization' do + it 'uses a specific region when provided' do + headers = { 'Accept-Language' => 'zh-HK' } + + get "/about", headers: headers + expect(response.body).to include( + I18n.t('about.about_mastodon', locale: 'zh-HK') + ) + end + + it 'falls back to a locale when region missing' do + headers = { 'Accept-Language' => 'es-FAKE' } + + get "/about", headers: headers + expect(response.body).to include( + I18n.t('about.about_mastodon', locale: 'es') + ) + end + it 'falls back to english when locale is missing' do + headers = { 'Accept-Language' => '12-FAKE' } + + get "/about", headers: headers + expect(response.body).to include( + I18n.t('about.about_mastodon', locale: 'en') + ) + end +end -- cgit