diff options
| author | (quasar) nebula <towerofnix@gmail.com> | 2021-04-05 16:18:59 -0300 |
|---|---|---|
| committer | (quasar) nebula <towerofnix@gmail.com> | 2021-04-05 16:18:59 -0300 |
| commit | e86738fc4aef746a7fa4aef6c84a0b0bc0f9005a (patch) | |
| tree | 80b0fd4c90610413f8d2c5de956adce13840c38b | |
| parent | d55610a3869167c8100ceec39f36334b5395de40 (diff) | |
use or mock ListFormat api on client
| -rw-r--r-- | static/client.js | 35 | ||||
| -rwxr-xr-x | upd8.js | 3 |
2 files changed, 35 insertions, 3 deletions
diff --git a/static/client.js b/static/client.js index b79539e4..96d227f1 100644 --- a/static/client.js +++ b/static/client.js @@ -12,6 +12,38 @@ let officialAlbumData, fandomAlbumData, artistNames; let ready = false; +// Localiz8tion nonsense ---------------------------------- + +const language = document.documentElement.getAttribute('lang'); + +let list; +if ( + typeof Intl === 'object' && + typeof Intl.ListFormat === 'function' +) { + const getFormat = type => { + const formatter = new Intl.ListFormat(language, {type}); + return formatter.format.bind(formatter); + }; + + list = { + conjunction: getFormat('conjunction'), + disjunction: getFormat('disjunction'), + unit: getFormat('unit') + }; +} else { + // Not a gr8 mock we've got going here, 8ut it's *mostly* language-free. + // We use the same mock for every list 'cuz we don't have any of the + // necessary CLDR info to appropri8tely distinguish 8etween them. + const arbitraryMock = array => array.join(', '); + + list = { + conjunction: arbitraryMock, + disjunction: arbitraryMock, + unit: arbitraryMock + }; +} + // Miscellaneous helpers ---------------------------------- function rebase(href, rebaseKey = 'rebaseLocalized') { @@ -251,9 +283,8 @@ const infoCard = (() => { imgLink.href = rebase(data.cover.paths.original, 'rebaseMedia'); if (containerShow === containerReveal) { - // TODO: List localiz8tion? const cw = containerShow.querySelector('.info-card-art-warnings'); - cw.innerText = data.cover.warnings.join(', '); + cw.innerText = list.unit(data.cover.warnings); const reveal = containerShow.querySelector('.reveal'); reveal.classList.remove('revealed'); diff --git a/upd8.js b/upd8.js index 445ff8d7..61be4b06 100755 --- a/upd8.js +++ b/upd8.js @@ -2451,6 +2451,7 @@ writePage.html = (pageFn, {paths, strings, to}) => { return filterEmptyLines(fixWS` <!DOCTYPE html> <html ${attributes({ + lang: strings.code, 'data-rebase-localized': to('localized.root'), 'data-rebase-shared': to('shared.root'), 'data-rebase-media': to('media.root'), @@ -2850,7 +2851,7 @@ function getRevealStringFromWarnings(warnings, {strings}) { function getRevealStringFromTags(tags, {strings}) { return tags && tags.some(tag => tag.isCW) && ( - getRevealStringFromWarnings(tags.filter(tag => tag.isCW).map(tag => tag.name).join(', '), {strings})); + getRevealStringFromWarnings(strings.list.unit(tags.filter(tag => tag.isCW).map(tag => tag.name).join(', '), {strings}))); } function generateCoverLink({ |