Skip to content

Commit 74d4c24

Browse files
committed
Thanks TallTed Prefered to Preferred
1 parent 8dff21f commit 74d4c24

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

src/widgets/forms/autocomplete/autocompletePicker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as widgets from '../../../widgets'
99
import { kb } from '../../../logic'
1010
import { NamedNode, Literal } from 'rdflib'
1111
import { queryPublicDataByName, bindingToTerm, AUTOCOMPLETE_LIMIT, QueryParameters } from './publicData'
12-
import { filterByLanguage, getPreferredLanguages, defaultPreferedLangages } from './language'
12+
import { filterByLanguage, getPreferredLanguages, defaultPreferredLangages } from './language'
1313

1414
const AUTOCOMPLETE_THRESHOLD = 4 // don't check until this many characters typed
1515
const AUTOCOMPLETE_ROWS = 20 // 20?
@@ -142,7 +142,7 @@ export async function renderAutoComplete (dom: HTMLDocument,
142142
let bindings
143143
try {
144144
bindings = await queryPublicDataByName(filter, targetClass as any,
145-
languagePrefs || defaultPreferedLangages, acOptions.queryParams)
145+
languagePrefs || defaultPreferredLangages, acOptions.queryParams)
146146
} catch (err) {
147147
complain('Error querying db of organizations: ' + err)
148148
inputEventHandlerLock = false

src/widgets/forms/autocomplete/language.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ export interface Binding {
2424

2525
export const languageCodeURIBase = 'https://www.w3.org/ns/iana/language-code/' /// @@ unsupported on the web (2021)
2626

27-
export const defaultPreferedLangages = ['en', 'fr', 'de', 'it', 'ar']
27+
export const defaultPreferredLangages = ['en', 'fr', 'de', 'it', 'ar']
2828

2929
export function addDefaults (array) {
3030
if (!array) array = []
31-
return array.concat(defaultPreferedLangages.filter(code => !array.includes(code)))
31+
return array.concat(defaultPreferredLangages.filter(code => !array.includes(code)))
3232
}
3333

3434
export async function getPreferredLanagugesFor (person: NamedNode) {
@@ -37,7 +37,7 @@ export async function getPreferredLanagugesFor (person: NamedNode) {
3737
const list = kb.any(person, ns.schema('knowsLanguage'), null, doc) as Collection | undefined
3838
if (!list) {
3939
// console.log(`User ${person} has not set their languages in their profile.`)
40-
return defaultPreferedLangages
40+
return defaultPreferredLangages
4141
}
4242
const languageCodeArray: string[] = []
4343
list.elements.forEach(item => {
@@ -82,7 +82,7 @@ export async function getPreferredLanguages () {
8282
return addDefaults([navigator.language.split('-')[0]])
8383
}
8484
}
85-
return defaultPreferedLangages
85+
return defaultPreferredLangages
8686
}
8787

8888
/* From an array of bindings with a names for each row,
@@ -98,8 +98,8 @@ export function filterByLanguage (bindings, languagePrefs) {
9898
uris[uri].push(binding)
9999
})
100100

101-
const languagePrefs2 = languagePrefs || defaultPreferedLangages
102-
languagePrefs2.reverse() // prefered last
101+
const languagePrefs2 = languagePrefs || defaultPreferredLangages
102+
languagePrefs2.reverse() // Preferred last
103103

104104
const slimmed = ([] as Array<Binding>)
105105
// console.log(` @@ {languagePrefs2 ${languagePrefs2}`)

src/widgets/forms/autocomplete/publicData.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as debug from '../../../debug'
99
import * as ns from '../../../ns'
1010
import { kb } from '../../../logic'
1111
// import * as logic from '../../../logic'
12-
import { getPreferredLanguages, defaultPreferedLangages } from './language'
12+
import { getPreferredLanguages, defaultPreferredLangages } from './language'
1313

1414
export const AUTOCOMPLETE_LIMIT = 200 // How many to get from server
1515
// With 3000 we could exceed the wikidata timeout
@@ -325,7 +325,7 @@ export async function queryPublicDataByName (
325325
if (!theClass) {
326326
throw new Error('queryPublicDataByName: No class provided')
327327
}
328-
const languagePrefs = await getPreferredLanguages() || defaultPreferedLangages
328+
const languagePrefs = await getPreferredLanguages() || defaultPreferredLangages
329329
const language = languagePrefs[0] || 'en'
330330
if (queryTarget.searchByNameQuery) {
331331
const sparql = substituteStrings(queryTarget.searchByNameQuery)

test/unit/widgets/forms/autocomplete/language.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
} from '../../../../../src/widgets/forms/autocomplete/autocompleteField'
1111
import {
1212
languageCodeURIBase,
13-
defaultPreferedLangages,
13+
defaultPreferredLangages,
1414
getPreferredLanagugesFor,
1515
getPreferredLanguages,
1616
filterByLanguage,
@@ -92,12 +92,12 @@ describe('addDefaults', () => {
9292
expect(addDefaults(langArray)).toEqual(expectedDefaults)
9393
})
9494
})
95-
describe('defaultPreferedLangages', () => {
95+
describe('defaultPreferredLangages', () => {
9696
it('exists as a array', () => {
97-
expect(defaultPreferedLangages).toBeInstanceOf(Array)
97+
expect(defaultPreferredLangages).toBeInstanceOf(Array)
9898
})
9999
it('exists as a array', () => {
100-
expect(defaultPreferedLangages).toEqual(expectedDefaults)
100+
expect(defaultPreferredLangages).toEqual(expectedDefaults)
101101
})
102102
})
103103
describe('getPreferredLanguages', () => {
@@ -143,7 +143,7 @@ describe('filterByLanguage', () => {
143143
})
144144

145145
it('filters picking english by default', async () => {
146-
const result = filterByLanguage(elephants, defaultPreferedLangages)
146+
const result = filterByLanguage(elephants, defaultPreferredLangages)
147147
const names = result.map(binding => binding.name.value)
148148
expect(names).toEqual(['elephant'])
149149
})

0 commit comments

Comments
 (0)