From 510e184216e69aeab3f3f4e421617c640aa7def9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 15 Nov 2019 21:00:09 +0100 Subject: [PATCH] Fix localization test failing due to order of locale definitions (#12393) --- config/application.rb | 4 ++-- spec/requests/localization_spec.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/application.rb b/config/application.rb index 6cd660ca2..e1f7ae707 100644 --- a/config/application.rb +++ b/config/application.rb @@ -53,8 +53,8 @@ module Mastodon :el, :en, :eo, - :es, :'es-AR', + :es, :et, :eu, :fa, @@ -93,8 +93,8 @@ module Mastodon :sk, :sl, :sq, - :sr, :'sr-Latn', + :sr, :sv, :ta, :te, diff --git a/spec/requests/localization_spec.rb b/spec/requests/localization_spec.rb index 496a885e8..175f02ae9 100644 --- a/spec/requests/localization_spec.rb +++ b/spec/requests/localization_spec.rb @@ -26,6 +26,7 @@ describe 'Localization' do I18n.t('about.tagline', locale: 'es') ) end + it 'falls back to english when locale is missing' do headers = { 'Accept-Language' => '12-FAKE' }