forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Prioritise language codes with regions (#7731)
* prioritise chinese and portugese
* more language name cleanup
* skip ast to fix false positive
authored by
Samuel Newman
and committed by
GitHub
67c394bc
c995eb2f
+16
-7
+5
-5
src/locale/languages.ts
+5
-5
src/locale/languages.ts
···
163
163
{code3: 'cad', code2: '', name: 'Caddo'},
164
164
{code3: 'cai', code2: '', name: 'Central American Indian languages'},
165
165
{code3: 'car', code2: '', name: 'Galibi Carib'},
166
-
{code3: 'cat', code2: 'ca', name: 'Catalan; Valencian'},
166
+
{code3: 'cat', code2: 'ca', name: 'Catalan'},
167
167
{code3: 'cau', code2: '', name: 'Caucasian languages'},
168
168
{code3: 'ceb', code2: '', name: 'Cebuano'},
169
169
{code3: 'cel', code2: '', name: 'Celtic languages'},
···
218
218
{code3: 'efi', code2: '', name: 'Efik'},
219
219
{code3: 'egy', code2: '', name: 'Egyptian (Ancient)'},
220
220
{code3: 'eka', code2: '', name: 'Ekajuk'},
221
-
{code3: 'ell', code2: 'el', name: 'Greek, Modern (1453-)'},
221
+
{code3: 'ell', code2: 'el', name: 'Greek'},
222
222
{code3: 'elx', code2: '', name: 'Elamite'},
223
223
{code3: 'eng', code2: 'en', name: 'English'},
224
224
{code3: 'enm', code2: '', name: 'English, Middle (1100-1500)'},
···
263
263
{code3: 'gor', code2: '', name: 'Gorontalo'},
264
264
{code3: 'got', code2: '', name: 'Gothic'},
265
265
{code3: 'grb', code2: '', name: 'Grebo'},
266
-
{code3: 'grc', code2: '', name: 'Greek, Ancient (to 1453)'},
267
-
{code3: 'gre', code2: 'el', name: 'Greek, Modern (1453-)'},
266
+
{code3: 'grc', code2: '', name: 'Ancient Greek'},
267
+
{code3: 'gre', code2: 'el', name: 'Greek'},
268
268
{code3: 'grn', code2: 'gn', name: 'Guarani'},
269
269
{code3: 'gsw', code2: '', name: 'Swiss German; Alemannic; Alsatian'},
270
270
{code3: 'guj', code2: 'gu', name: 'Gujarati'},
···
361
361
{code3: 'lit', code2: 'lt', name: 'Lithuanian'},
362
362
{code3: 'lol', code2: '', name: 'Mongo'},
363
363
{code3: 'loz', code2: '', name: 'Lozi'},
364
-
{code3: 'ltz', code2: 'lb', name: 'Luxembourgish; Letzeburgesch'},
364
+
{code3: 'ltz', code2: 'lb', name: 'Luxembourgish'},
365
365
{code3: 'lua', code2: '', name: 'Luba-Lulua'},
366
366
{code3: 'lub', code2: 'lu', name: 'Luba-Katanga'},
367
367
{code3: 'lug', code2: 'lg', name: 'Ganda'},
+11
-2
src/view/screens/Search/Search.tsx
+11
-2
src/view/screens/Search/Search.tsx
···
348
348
if (aIsUser && !bIsUser) return -1
349
349
if (bIsUser && !aIsUser) return 1
350
350
// prioritize "common" langs in the network
351
-
const aIsCommon = !!APP_LANGUAGES.find(al => al.code2 === a.value)
352
-
const bIsCommon = !!APP_LANGUAGES.find(al => al.code2 === b.value)
351
+
const aIsCommon = !!APP_LANGUAGES.find(
352
+
al =>
353
+
// skip `ast`, because it uses a 3-letter code which conflicts with `as`
354
+
// it begins with `a` anyway so still is top of the list
355
+
al.code2 !== 'ast' && al.code2.startsWith(a.value),
356
+
)
357
+
const bIsCommon = !!APP_LANGUAGES.find(
358
+
al =>
359
+
// ditto
360
+
al.code2 !== 'ast' && al.code2.startsWith(b.value),
361
+
)
353
362
if (aIsCommon && !bIsCommon) return -1
354
363
if (bIsCommon && !aIsCommon) return 1
355
364
// fall back to alphabetical