forked from cybrespace/mastodon
Fix wording on admin instances view, fix typos in language detector spec (#2106)
This commit is contained in:
parent
c6a4ab3b92
commit
96268e76e6
|
@ -115,9 +115,9 @@ en:
|
||||||
title: Domain Blocks
|
title: Domain Blocks
|
||||||
undo: Undo
|
undo: Undo
|
||||||
instances:
|
instances:
|
||||||
account_count: Accounts
|
account_count: Known accounts
|
||||||
domain_name: Domain name
|
domain_name: Domain
|
||||||
title: Instances
|
title: Known Instances
|
||||||
pubsubhubbub:
|
pubsubhubbub:
|
||||||
callback_url: Callback URL
|
callback_url: Callback URL
|
||||||
confirmed: Confirmed
|
confirmed: Confirmed
|
||||||
|
|
|
@ -1,24 +1,23 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
describe LanguageDetector do
|
describe LanguageDetector do
|
||||||
describe 'to_iso_s' do
|
describe 'to_iso_s' do
|
||||||
it 'detects english language' do
|
it 'detects english language' do
|
||||||
string = 'Hello and welcome to mastadon'
|
string = 'Hello and welcome to mastodon'
|
||||||
result = described_class.new(string).to_iso_s
|
result = described_class.new(string).to_iso_s
|
||||||
|
|
||||||
expect(result).to eq :en
|
expect(result).to eq :en
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'detects spanish language' do
|
it 'detects spanish language' do
|
||||||
string = 'Obtener un Hola y bienvenidos a Mastadon'
|
string = 'Obtener un Hola y bienvenidos a Mastodon'
|
||||||
result = described_class.new(string).to_iso_s
|
result = described_class.new(string).to_iso_s
|
||||||
|
|
||||||
expect(result).to eq :es
|
expect(result).to eq :es
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'when language cant be detected' do
|
describe 'when language can\'t be detected' do
|
||||||
it 'confirm language engine cant detect' do
|
it 'confirm language engine cant detect' do
|
||||||
result = WhatLanguage.new(:all).language_iso('')
|
result = WhatLanguage.new(:all).language_iso('')
|
||||||
expect(result).to be_nil
|
expect(result).to be_nil
|
||||||
|
@ -26,17 +25,17 @@ describe LanguageDetector do
|
||||||
|
|
||||||
describe 'with an account' do
|
describe 'with an account' do
|
||||||
it 'uses the account locale when present' do
|
it 'uses the account locale when present' do
|
||||||
user = double(:user, locale: 'fr')
|
user = double(:user, locale: 'fr')
|
||||||
account = double(:account, user: user)
|
account = double(:account, user: user)
|
||||||
result = described_class.new('', account).to_iso_s
|
result = described_class.new('', account).to_iso_s
|
||||||
|
|
||||||
expect(result).to eq :fr
|
expect(result).to eq :fr
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'uses default locale when account is present but has no locale' do
|
it 'uses default locale when account is present but has no locale' do
|
||||||
user = double(:user, locale: nil)
|
user = double(:user, locale: nil)
|
||||||
account = double(:accunt, user: user)
|
account = double(:accunt, user: user)
|
||||||
result = described_class.new('', account).to_iso_s
|
result = described_class.new('', account).to_iso_s
|
||||||
|
|
||||||
expect(result).to eq :en
|
expect(result).to eq :en
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue