hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix localization test failing due to order of locale definitions (#12393)

signup-info-prompt
Eugen Rochko 2019-11-15 21:00:09 +01:00 committed by GitHub
parent 24ea938ce1
commit 510e184216
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/application.rb
View File

@ -53,8 +53,8 @@ module Mastodon
:el, :el,
:en, :en,
:eo, :eo,
:es,
:'es-AR', :'es-AR',
:es,
:et, :et,
:eu, :eu,
:fa, :fa,
@ -93,8 +93,8 @@ module Mastodon
:sk, :sk,
:sl, :sl,
:sq, :sq,
:sr,
:'sr-Latn', :'sr-Latn',
:sr,
:sv, :sv,
:ta, :ta,
:te, :te,

1
spec/requests/localization_spec.rb
View File

@ -26,6 +26,7 @@ describe 'Localization' do
I18n.t('about.tagline', locale: 'es') I18n.t('about.tagline', locale: 'es')
) )
end end
it 'falls back to english when locale is missing' do it 'falls back to english when locale is missing' do
headers = { 'Accept-Language' => '12-FAKE' } headers = { 'Accept-Language' => '12-FAKE' }