luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix wording on admin instances view, fix typos in language detector spec (#2106)

Browse source
This commit is contained in:
Eugen 2017-04-18 23:39:51 +02:00 committed by GitHub
parent c6a4ab3b92
commit 96268e76e6
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/locales/en.yml
View file

@ -115,9 +115,9 @@ en:
title: Domain Blocks
undo: Undo
instances:
account_count: Accounts
domain_name: Domain name
title: Instances
account_count: Known accounts
domain_name: Domain
title: Known Instances
pubsubhubbub:
callback_url: Callback URL
confirmed: Confirmed

15
spec/lib/language_detector_spec.rb
View file

@ -1,24 +1,23 @@
# frozen_string_literal: true
require 'rails_helper'
describe LanguageDetector do
describe 'to_iso_s' 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
expect(result).to eq :en
end
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
expect(result).to eq :es
end
describe 'when language cant be detected' do
describe 'when language can\'t be detected' do
it 'confirm language engine cant detect' do
result = WhatLanguage.new(:all).language_iso('')
expect(result).to be_nil
@ -26,17 +25,17 @@ describe LanguageDetector do
describe 'with an account' do
it 'uses the account locale when present' do
user = double(:user, locale: 'fr')
user = double(:user, locale: 'fr')
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
end
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)
result = described_class.new('', account).to_iso_s
result = described_class.new('', account).to_iso_s
expect(result).to eq :en
end