diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-11-15 21:00:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 21:00:09 +0100 |
| commit | 510e184216e69aeab3f3f4e421617c640aa7def9 (patch) | |
| tree | fcbc7f25929b31aa21fb16ad9b47b90e22d6d6da | |
| parent | 24ea938ce188729913ad4c8c0a33899f9c1e733d (diff) | |
Fix localization test failing due to order of locale definitions (#12393)
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | 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' } |