Language fixes (#5384)
* Add some comments * Decouple language settings * Normalize on read/write * Refactor * Support device locale on app startup * Cleanup, port to web * Clean up comments * Comment * Try not to mutate * Protect util handling, update test * Dedupe array values
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
import {parse} from 'bcp-47'
|
||||
|
||||
import {dedupArray} from '#/lib/functions'
|
||||
import {logger} from '#/logger'
|
||||
import {Schema} from '#/state/persisted/schema'
|
||||
|
||||
export function normalizeData(data: Schema) {
|
||||
const next = {...data}
|
||||
|
||||
/**
|
||||
* Normalize language prefs to ensure that these values only contain 2-letter
|
||||
* country codes without region.
|
||||
*/
|
||||
try {
|
||||
const langPrefs = {...next.languagePrefs}
|
||||
langPrefs.primaryLanguage = normalizeLanguageTagToTwoLetterCode(
|
||||
langPrefs.primaryLanguage,
|
||||
)
|
||||
langPrefs.contentLanguages = dedupArray(
|
||||
langPrefs.contentLanguages.map(lang =>
|
||||
normalizeLanguageTagToTwoLetterCode(lang),
|
||||
),
|
||||
)
|
||||
langPrefs.postLanguage = langPrefs.postLanguage
|
||||
.split(',')
|
||||
.map(lang => normalizeLanguageTagToTwoLetterCode(lang))
|
||||
.filter(Boolean)
|
||||
.join(',')
|
||||
langPrefs.postLanguageHistory = dedupArray(
|
||||
langPrefs.postLanguageHistory.map(postLanguage => {
|
||||
return postLanguage
|
||||
.split(',')
|
||||
.map(lang => normalizeLanguageTagToTwoLetterCode(lang))
|
||||
.filter(Boolean)
|
||||
.join(',')
|
||||
}),
|
||||
)
|
||||
next.languagePrefs = langPrefs
|
||||
} catch (e: any) {
|
||||
logger.error(`persisted state: failed to normalize language prefs`, {
|
||||
safeMessage: e.message,
|
||||
})
|
||||
}
|
||||
|
||||
return next
|
||||
}
|
||||
|
||||
export function normalizeLanguageTagToTwoLetterCode(lang: string) {
|
||||
const result = parse(lang).language
|
||||
return result ?? lang
|
||||
}
|
||||
Reference in New Issue
Block a user