Skip to content

Commit 98411c8

Browse files
bourgeoabourgeoa
authored
Merge pull request SolidOS#432 from janschill/fix-typos
Fix typos; closes SolidOS#429
2 parents 1d0043a + eec6293 commit 98411c8

4 files changed

Lines changed: 25 additions & 25 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, defaultPreferredLangages } from './language'
12+
import { filterByLanguage, getPreferredLanguages, defaultPreferredLanguages } 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 || defaultPreferredLangages, acOptions.queryParams)
145+
languagePrefs || defaultPreferredLanguages, acOptions.queryParams)
146146
} catch (err) {
147147
complain('Error querying db of organizations: ' + err)
148148
inputEventHandlerLock = false

‎src/widgets/forms/autocomplete/language.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ 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 defaultPreferredLangages = ['en', 'fr', 'de', 'it', 'ar']
27+
export const defaultPreferredLanguages = ['en', 'fr', 'de', 'it', 'ar']
2828

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

34-
export async function getPreferredLanagugesFor (person: NamedNode) {
34+
export async function getPreferredLanguagesFor (person: NamedNode) {
3535
const doc = person.doc()
3636
await kb.fetcher.load(doc)
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 defaultPreferredLangages
40+
return defaultPreferredLanguages
4141
}
4242
const languageCodeArray: string[] = []
4343
list.elements.forEach(item => {
@@ -71,7 +71,7 @@ export async function getPreferredLanguages () {
7171
// See https://github.com/solid/solidos/issues/42
7272
const me = await authn.currentUser() as NamedNode
7373
if (me) { // If logged in
74-
const solidLanguagePrefs = await getPreferredLanagugesFor(me)
74+
const solidLanguagePrefs = await getPreferredLanguagesFor(me)
7575
if (solidLanguagePrefs) return solidLanguagePrefs
7676
}
7777
if (typeof navigator !== 'undefined') { // use browser settings
@@ -82,7 +82,7 @@ export async function getPreferredLanguages () {
8282
return addDefaults([navigator.language.split('-')[0]])
8383
}
8484
}
85-
return defaultPreferredLangages
85+
return defaultPreferredLanguages
8686
}
8787

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

101-
const languagePrefs2 = languagePrefs || defaultPreferredLangages
101+
const languagePrefs2 = languagePrefs || defaultPreferredLanguages
102102
languagePrefs2.reverse() // Preferred last
103103

104104
const slimmed = ([] as Array<Binding>)

‎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, defaultPreferredLangages } from './language'
12+
import { getPreferredLanguages, defaultPreferredLanguages } 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() || defaultPreferredLangages
328+
const languagePrefs = await getPreferredLanguages() || defaultPreferredLanguages
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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import { parse } from 'rdflib'
55
import {
66
languageCodeURIBase,
7-
defaultPreferredLangages,
8-
getPreferredLanagugesFor,
7+
defaultPreferredLanguages,
8+
getPreferredLanguagesFor,
99
getPreferredLanguages,
1010
filterByLanguage,
1111
addDefaults
@@ -78,12 +78,12 @@ describe('addDefaults', () => {
7878
expect(addDefaults(langArray)).toEqual(expectedDefaults)
7979
})
8080
})
81-
describe('defaultPreferredLangages', () => {
81+
describe('defaultPreferredLanguages', () => {
8282
it('exists as a array', () => {
83-
expect(defaultPreferredLangages).toBeInstanceOf(Array)
83+
expect(defaultPreferredLanguages).toBeInstanceOf(Array)
8484
})
8585
it('exists as a array', () => {
86-
expect(defaultPreferredLangages).toEqual(expectedDefaults)
86+
expect(defaultPreferredLanguages).toEqual(expectedDefaults)
8787
})
8888
})
8989
describe('getPreferredLanguages', () => {
@@ -101,24 +101,24 @@ describe('getPreferredLanguages', () => {
101101
expect(preferred).toEqual(['it', 'en', 'fr', 'de', 'ar'])
102102
})
103103
})
104-
describe('getPreferredLanagugesFor', () => {
104+
describe('getPreferredLanguagesFor', () => {
105105
it('exists as a function', () => {
106-
expect(getPreferredLanagugesFor).toBeInstanceOf(Function)
106+
expect(getPreferredLanguagesFor).toBeInstanceOf(Function)
107107
})
108-
it.skip('returns just greek for Alice, plus deafults ', async () => {
108+
it.skip('returns just greek for Alice, plus defaults ', async () => {
109109
// Note to Tim: for some reason languageCodeURIBase doesn't find 'el'
110110
const usersLanguages = { elements: [{ value: 'https://www.w3.org/ns/iana/language-code/el' }] }
111111
const kbAnySpy = jest.spyOn(kb, 'any').mockReturnValueOnce(usersLanguages).mockReturnValueOnce(usersLanguages)
112-
const result = await getPreferredLanagugesFor(alice)
112+
const result = await getPreferredLanguagesFor(alice)
113113
expect(result).toEqual(['el'].concat(['en', 'fr', 'de', 'it', 'ar']))
114114
expect(kbAnySpy).toHaveBeenCalledTimes(2)
115115
})
116-
it('returns english, french Bob, plus deafults', async () => {
117-
const result = await getPreferredLanagugesFor(bob)
116+
it('returns english, french Bob, plus defaults', async () => {
117+
const result = await getPreferredLanguagesFor(bob)
118118
expect(result).toEqual(['en', 'fr', 'de', 'it', 'ar'])
119119
})
120-
it('returns nothing for Charlie, just deafults', async () => {
121-
const result = await getPreferredLanagugesFor(charlie)
120+
it('returns nothing for Charlie, just defaults', async () => {
121+
const result = await getPreferredLanguagesFor(charlie)
122122
expect(result).toEqual(expectedDefaults)
123123
})
124124
})
@@ -129,7 +129,7 @@ describe('filterByLanguage', () => {
129129
})
130130

131131
it('filters picking english by default', async () => {
132-
const result = filterByLanguage(elephants, defaultPreferredLangages)
132+
const result = filterByLanguage(elephants, defaultPreferredLanguages)
133133
const names = result.map(binding => binding.name.value)
134134
expect(names).toEqual(['elephant'])
135135
})

0 commit comments

Comments
 (0)