From c6aff602f65dfa4e5a1bc1a8c6841cdda829a0ce Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 10 May 2022 20:17:40 -0300 Subject: rename strings( to language.$( --- src/page/album-commentary.js | 24 ++++++------ src/page/album.js | 64 +++++++++++++++---------------- src/page/artist.js | 90 ++++++++++++++++++++++---------------------- src/page/flash.js | 28 +++++++------- src/page/group.js | 40 ++++++++++---------- src/page/homepage.js | 10 ++--- src/page/listing.js | 18 ++++----- src/page/news.js | 16 ++++---- src/page/tag.js | 10 ++--- src/page/track.js | 58 ++++++++++++++-------------- 10 files changed, 179 insertions(+), 179 deletions(-) (limited to 'src/page') diff --git a/src/page/album-commentary.js b/src/page/album-commentary.js index 90b36fc..3c2b23c 100644 --- a/src/page/album-commentary.js +++ b/src/page/album-commentary.js @@ -36,28 +36,28 @@ export function write(album, {wikiData}) { to, transformMultiline }) => ({ - title: strings('albumCommentaryPage.title', {album: album.name}), + title: language.$('albumCommentaryPage.title', {album: album.name}), stylesheet: getAlbumStylesheet(album), theme: getThemeString(album.color), main: { content: fixWS`
-

${strings('albumCommentaryPage.title', { +

${language.$('albumCommentaryPage.title', { album: link.album(album) })}

-

${strings('albumCommentaryPage.infoLine', { +

${language.$('albumCommentaryPage.infoLine', { words: `${strings.count.words(words, {unit: true})}`, entries: `${language.countCommentaryEntries(entries.length, {unit: true})}` })}

${album.commentary && fixWS` -

${strings('albumCommentaryPage.entry.title.albumCommentary')}

+

${language.$('albumCommentaryPage.entry.title.albumCommentary')}

${transformMultiline(album.commentary)}
`} ${album.tracks.filter(t => t.commentary).map(track => fixWS` -

${strings('albumCommentaryPage.entry.title.trackCommentary', { +

${language.$('albumCommentaryPage.entry.title.trackCommentary', { track: link.track(track) })}

@@ -73,10 +73,10 @@ export function write(album, {wikiData}) { {toHome: true}, { path: ['localized.commentaryIndex'], - title: strings('commentaryIndex.title') + title: language.$('commentaryIndex.title') }, { - html: strings('albumCommentaryPage.nav.album', { + html: language.$('albumCommentaryPage.nav.album', { album: link.albumCommentary(album, {class: 'current'}) }) } @@ -109,21 +109,21 @@ export function writeTargetless({wikiData}) { link, strings }) => ({ - title: strings('commentaryIndex.title'), + title: language.$('commentaryIndex.title'), main: { content: fixWS`
-

${strings('commentaryIndex.title')}

-

${strings('commentaryIndex.infoLine', { +

${language.$('commentaryIndex.title')}

+

${language.$('commentaryIndex.infoLine', { words: `${strings.count.words(totalWords, {unit: true})}`, entries: `${language.countCommentaryEntries(totalEntries, {unit: true})}` })}

-

${strings('commentaryIndex.albumList.title')}

+

${language.$('commentaryIndex.albumList.title')}

    ${data .map(({ album, entries, words }) => fixWS` -
  • ${strings('commentaryIndex.albumList.item', { +
  • ${language.$('commentaryIndex.albumList.item', { album: link.albumCommentary(album), words: strings.count.words(words, {unit: true}), entries: language.countCommentaryEntries(entries.length, {unit: true}) diff --git a/src/page/album.js b/src/page/album.js index 66d4bfa..4b4ac6b 100644 --- a/src/page/album.js +++ b/src/page/album.js @@ -41,11 +41,11 @@ export function write(album, {wikiData}) { track.artistContribs.map(c => c.who), album.artistContribs.map(c => c.who), {checkOrder: false}) - ? strings('trackList.item.withDuration', itemOpts) - : strings('trackList.item.withDuration.withArtists', { + ? language.$('trackList.item.withDuration', itemOpts) + : language.$('trackList.item.withDuration.withArtists', { ...itemOpts, by: `${ - strings('trackList.item.withArtists.by', { + language.$('trackList.item.withArtists.by', { artists: getArtistString(track.artistContribs) }) }` @@ -121,7 +121,7 @@ export function write(album, {wikiData}) { const cover = getAlbumCover(album); return { - title: strings('albumPage.title', {album: album.name}), + title: language.$('albumPage.title', {album: album.name}), stylesheet: getAlbumStylesheet(album), theme: getThemeString(album.color, [ `--album-directory: ${album.directory}` @@ -130,7 +130,7 @@ export function write(album, {wikiData}) { banner: album.bannerArtistContribs.length && { dimensions: album.bannerDimensions, path: ['media.albumBanner', album.directory, album.bannerFileExtension], - alt: strings('misc.alt.albumBanner'), + alt: language.$('misc.alt.albumBanner'), position: 'top' }, @@ -138,58 +138,58 @@ export function write(album, {wikiData}) { content: fixWS` ${cover && generateCoverLink({ src: cover, - alt: strings('misc.alt.albumCover'), + alt: language.$('misc.alt.albumCover'), tags: album.artTags })} -

    ${strings('albumPage.title', {album: album.name})}

    +

    ${language.$('albumPage.title', {album: album.name})}

    ${[ - album.artistContribs.length && strings('releaseInfo.by', { + album.artistContribs.length && language.$('releaseInfo.by', { artists: getArtistString(album.artistContribs, { showContrib: true, showIcons: true }) }), - album.coverArtistContribs.length && strings('releaseInfo.coverArtBy', { + album.coverArtistContribs.length && language.$('releaseInfo.coverArtBy', { artists: getArtistString(album.coverArtistContribs, { showContrib: true, showIcons: true }) }), - album.wallpaperArtistContribs.length && strings('releaseInfo.wallpaperArtBy', { + album.wallpaperArtistContribs.length && language.$('releaseInfo.wallpaperArtBy', { artists: getArtistString(album.wallpaperArtistContribs, { showContrib: true, showIcons: true }) }), - album.bannerArtistContribs.length && strings('releaseInfo.bannerArtBy', { + album.bannerArtistContribs.length && language.$('releaseInfo.bannerArtBy', { artists: getArtistString(album.bannerArtistContribs, { showContrib: true, showIcons: true }) }), - album.date && strings('releaseInfo.released', { + album.date && language.$('releaseInfo.released', { date: strings.count.date(album.date) }), (album.coverArtDate && +album.coverArtDate !== +album.date && - strings('releaseInfo.artReleased', { + language.$('releaseInfo.artReleased', { date: strings.count.date(album.coverArtDate) })), - strings('releaseInfo.duration', { + language.$('releaseInfo.duration', { duration: strings.count.duration(albumDuration, {approximate: album.tracks.length > 1}) }) ].filter(Boolean).join('
    \n')}

    ${commentaryEntries && `

    ${ - strings('releaseInfo.viewCommentary', { + language.$('releaseInfo.viewCommentary', { link: link.albumCommentary(album, { - text: strings('releaseInfo.viewCommentary.link') + text: language.$('releaseInfo.viewCommentary.link') }) }) }

    `} ${album.urls?.length && `

    ${ - strings('releaseInfo.listenOn', { + language.$('releaseInfo.listenOn', { links: strings.list.or(album.urls.map(url => fancifyURL(url, {album: true}))) }) }

    `} @@ -197,7 +197,7 @@ export function write(album, {wikiData}) {
    ${album.trackGroups.map(({ name, color, startIndex, tracks }) => fixWS`
    ${ - strings('trackList.group', { + language.$('trackList.group', { duration: strings.count.duration(getTotalDuration(tracks), {approximate: tracks.length > 1}), group: name }) @@ -215,14 +215,14 @@ export function write(album, {wikiData}) { ${album.dateAddedToWiki && fixWS`

    ${[ - strings('releaseInfo.addedToWiki', { + language.$('releaseInfo.addedToWiki', { date: strings.count.date(album.dateAddedToWiki) }) ].filter(Boolean).join('
    \n')}

    `} ${album.commentary && fixWS` -

    ${strings('releaseInfo.artistCommentary')}

    +

    ${language.$('releaseInfo.artistCommentary')}

    ${transformMultiline(album.commentary)}
    @@ -243,7 +243,7 @@ export function write(album, {wikiData}) { links: [ {toHome: true}, { - html: strings('albumPage.nav.album', { + html: language.$('albumPage.nav.album', { album: link.album(album, {class: 'current'}) }) }, @@ -276,7 +276,7 @@ export function generateAlbumSidebar(album, currentTrack, { /* const trackGroups = album.trackGroups || [{ - name: strings('albumSidebar.trackList.fallbackGroupName'), + name: language.$('albumSidebar.trackList.fallbackGroupName'), color: album.color, startIndex: 0, tracks: album.tracks @@ -287,13 +287,13 @@ export function generateAlbumSidebar(album, currentTrack, { const trackToListItem = track => html.tag('li', {class: track === currentTrack && 'current'}, - strings('albumSidebar.trackList.item', { + language.$('albumSidebar.trackList.item', { track: link.track(track) })); const nameOrDefault = (isDefaultTrackGroup, name) => (isDefaultTrackGroup - ? strings('albumSidebar.trackList.fallbackGroupName') + ? language.$('albumSidebar.trackList.fallbackGroupName') : name); const trackListPart = fixWS` @@ -309,11 +309,11 @@ export function generateAlbumSidebar(album, currentTrack, { html.tag('summary', {style: getLinkThemeString(color)}, (listTag === 'ol' - ? strings('albumSidebar.trackList.group.withRange', { + ? language.$('albumSidebar.trackList.group.withRange', { group: `${nameOrDefault(isDefaultTrackGroup, name)}`, range: `${startIndex + 1}–${startIndex + tracks.length}` }) - : strings('albumSidebar.trackList.group', { + : language.$('albumSidebar.trackList.group', { group: `${nameOrDefault(isDefaultTrackGroup, name)}` })) ), @@ -335,24 +335,24 @@ export function generateAlbumSidebar(album, currentTrack, { return {group, next, previous}; }).map(({group, next, previous}) => fixWS`

    ${ - strings('albumSidebar.groupBox.title', { + language.$('albumSidebar.groupBox.title', { group: link.groupInfo(group) }) }

    ${!currentTrack && transformMultiline(group.descriptionShort)} ${group.urls?.length && `

    ${ - strings('releaseInfo.visitOn', { + language.$('releaseInfo.visitOn', { links: strings.list.or(group.urls.map(url => fancifyURL(url))) }) }

    `} ${!currentTrack && fixWS` ${next && `

    ${ - strings('albumSidebar.groupBox.next', { + language.$('albumSidebar.groupBox.next', { album: link.album(next) }) }

    `} ${previous && `

    ${ - strings('albumSidebar.groupBox.previous', { + language.$('albumSidebar.groupBox.previous', { album: link.album(previous) }) }

    `} @@ -397,8 +397,8 @@ export function generateAlbumNavLinks(album, currentTrack, { }); const randomLink = `${ (currentTrack - ? strings('trackPage.nav.random') - : strings('albumPage.nav.randomTrack')) + ? language.$('trackPage.nav.random') + : language.$('albumPage.nav.randomTrack')) }`; return (previousNextLinks diff --git a/src/page/artist.js b/src/page/artist.js index 0383c68..3a9de70 100644 --- a/src/page/artist.js +++ b/src/page/artist.js @@ -143,20 +143,20 @@ export function write(artist, {wikiData}) { aka, entry, artists, contrib }) => (aka - ? strings('artistPage.creditList.entry.rerelease', {entry}) + ? language.$('artistPage.creditList.entry.rerelease', {entry}) : (artists.length ? ((contrib.what || contrib.whatArray?.length) - ? strings('artistPage.creditList.entry.withArtists.withContribution', { + ? language.$('artistPage.creditList.entry.withArtists.withContribution', { entry, artists: getArtistString(artists), contribution: (contrib.whatArray ? strings.list.unit(contrib.whatArray) : contrib.what) }) - : strings('artistPage.creditList.entry.withArtists', { + : language.$('artistPage.creditList.entry.withArtists', { entry, artists: getArtistString(artists) })) : ((contrib.what || contrib.whatArray?.length) - ? strings('artistPage.creditList.entry.withContribution', { + ? language.$('artistPage.creditList.entry.withContribution', { entry, contribution: (contrib.whatArray ? strings.list.unit(contrib.whatArray) : contrib.what) }) @@ -168,24 +168,24 @@ export function write(artist, {wikiData}) {
    ${chunks.map(({date, album, chunk, duration}) => fixWS`
    ${ - (date && duration) ? strings('artistPage.creditList.album.withDate.withDuration', { + (date && duration) ? language.$('artistPage.creditList.album.withDate.withDuration', { album: link.album(album), date: strings.count.date(date), duration: strings.count.duration(duration, {approximate: true}) - }) : date ? strings('artistPage.creditList.album.withDate', { + }) : date ? language.$('artistPage.creditList.album.withDate', { album: link.album(album), date: strings.count.date(date) - }) : duration ? strings('artistPage.creditList.album.withDuration', { + }) : duration ? language.$('artistPage.creditList.album.withDuration', { album: link.album(album), duration: strings.count.duration(duration, {approximate: true}) - }) : strings('artistPage.creditList.album', { + }) : language.$('artistPage.creditList.album', { album: link.album(album) })}
      ${(chunk .map(({track, ...props}) => ({ aka: track.aka, - entry: strings('artistPage.creditList.entry.track.withDuration', { + entry: language.$('artistPage.creditList.entry.track.withDuration', { track: link.track(track), duration: strings.count.duration(track.duration) }), @@ -283,47 +283,47 @@ export function write(artist, {wikiData}) { }); return { - title: strings('artistPage.title', {artist: name}), + title: language.$('artistPage.title', {artist: name}), main: { content: fixWS` ${artist.hasAvatar && generateCoverLink({ src: getArtistAvatar(artist), - alt: strings('misc.alt.artistAvatar') + alt: language.$('misc.alt.artistAvatar') })} -

      ${strings('artistPage.title', {artist: name})}

      +

      ${language.$('artistPage.title', {artist: name})}

      ${contextNotes && fixWS` -

      ${strings('releaseInfo.note')}

      +

      ${language.$('releaseInfo.note')}

      ${transformMultiline(contextNotes)}
      `} - ${urls?.length && `

      ${strings('releaseInfo.visitOn', { + ${urls?.length && `

      ${language.$('releaseInfo.visitOn', { links: strings.list.or(urls.map(url => fancifyURL(url, {strings}))) })}

      `} - ${hasGallery && `

      ${strings('artistPage.viewArtGallery', { + ${hasGallery && `

      ${language.$('artistPage.viewArtGallery', { link: link.artistGallery(artist, { - text: strings('artistPage.viewArtGallery.link') + text: language.$('artistPage.viewArtGallery.link') }) })}

      `} -

      ${strings('misc.jumpTo.withLinks', { +

      ${language.$('misc.jumpTo.withLinks', { links: strings.list.unit([ - allTracks.length && `${strings('artistPage.trackList.title')}`, - artThingsAll.length && `${strings('artistPage.artList.title')}`, - wikiInfo.enableFlashesAndGames && flashes.length && `${strings('artistPage.flashList.title')}`, - commentaryThings.length && `${strings('artistPage.commentaryList.title')}` + allTracks.length && `${language.$('artistPage.trackList.title')}`, + artThingsAll.length && `${language.$('artistPage.artList.title')}`, + wikiInfo.enableFlashesAndGames && flashes.length && `${language.$('artistPage.flashList.title')}`, + commentaryThings.length && `${language.$('artistPage.commentaryList.title')}` ].filter(Boolean)) })}

      ${allTracks.length && fixWS` -

      ${strings('artistPage.trackList.title')}

      -

      ${strings('artistPage.contributedDurationLine', { +

      ${language.$('artistPage.trackList.title')}

      +

      ${language.$('artistPage.contributedDurationLine', { artist: artist.name, duration: strings.count.duration(totalDuration, {approximate: true, unit: true}) })}

      -

      ${strings('artistPage.musicGroupsLine', { +

      ${language.$('artistPage.musicGroupsLine', { groups: strings.list.unit(musicGroups - .map(({ group, contributions }) => strings('artistPage.groupsLine.item', { + .map(({ group, contributions }) => language.$('artistPage.groupsLine.item', { group: link.groupInfo(group), contributions: language.countContributions(contributions) }))) @@ -331,22 +331,22 @@ export function write(artist, {wikiData}) { ${generateTrackList(trackListChunks)} `} ${artThingsAll.length && fixWS` -

      ${strings('artistPage.artList.title')}

      - ${hasGallery && `

      ${strings('artistPage.viewArtGallery.orBrowseList', { +

      ${language.$('artistPage.artList.title')}

      + ${hasGallery && `

      ${language.$('artistPage.viewArtGallery.orBrowseList', { link: link.artistGallery(artist, { - text: strings('artistPage.viewArtGallery.link') + text: language.$('artistPage.viewArtGallery.link') }) })}

      `} -

      ${strings('artistPage.artGroupsLine', { +

      ${language.$('artistPage.artGroupsLine', { groups: strings.list.unit(artGroups - .map(({ group, contributions }) => strings('artistPage.groupsLine.item', { + .map(({ group, contributions }) => language.$('artistPage.groupsLine.item', { group: link.groupInfo(group), contributions: language.countContributions(contributions) }))) })}

      ${artListChunks.map(({date, album, chunk}) => fixWS` -
      ${strings('artistPage.creditList.album.withDate', { +
      ${language.$('artistPage.creditList.album.withDate', { album: link.album(album), date: strings.count.date(date) })}
      @@ -354,10 +354,10 @@ export function write(artist, {wikiData}) { ${(chunk .map(({album, track, key, ...props}) => ({ entry: (track - ? strings('artistPage.creditList.entry.track', { + ? language.$('artistPage.creditList.entry.track', { track: link.track(track) }) - : `${strings('artistPage.creditList.entry.album.' + { + : `${language.$('artistPage.creditList.entry.album.' + { wallpaperArtistContribs: 'wallpaperArt', bannerArtistContribs: 'bannerArt', coverArtistContribs: 'coverArt' @@ -372,17 +372,17 @@ export function write(artist, {wikiData}) {
      `} ${wikiInfo.enableFlashesAndGames && flashes.length && fixWS` -

      ${strings('artistPage.flashList.title')}

      +

      ${language.$('artistPage.flashList.title')}

      ${flashListChunks.map(({act, chunk, dateFirst, dateLast}) => fixWS` -
      ${strings('artistPage.creditList.flashAct.withDateRange', { +
      ${language.$('artistPage.creditList.flashAct.withDateRange', { act: link.flash(chunk[0].flash, {text: act.name}), dateRange: strings.count.dateRange([dateFirst, dateLast]) })}
        ${(chunk .map(({flash, ...props}) => ({ - entry: strings('artistPage.creditList.entry.flash', { + entry: language.$('artistPage.creditList.entry.flash', { flash: link.flash(flash) }), ...props @@ -395,19 +395,19 @@ export function write(artist, {wikiData}) {
      `} ${commentaryThings.length && fixWS` -

      ${strings('artistPage.commentaryList.title')}

      +

      ${language.$('artistPage.commentaryList.title')}

      ${commentaryListChunks.map(({album, chunk}) => fixWS` -
      ${strings('artistPage.creditList.album', { +
      ${language.$('artistPage.creditList.album', { album: link.album(album) })}
        ${(chunk .map(({album, track, ...props}) => track - ? strings('artistPage.creditList.entry.track', { + ? language.$('artistPage.creditList.entry.track', { track: link.track(track) }) - : `${strings('artistPage.creditList.entry.album.commentary')}`) + : `${language.$('artistPage.creditList.entry.album.commentary')}`) .map(row => `
      • ${row}
        • `) .join('\n'))}
      @@ -439,13 +439,13 @@ export function write(artist, {wikiData}) { strings, to }) => ({ - title: strings('artistGalleryPage.title', {artist: name}), + title: language.$('artistGalleryPage.title', {artist: name}), main: { classes: ['top-index'], content: fixWS` -

      ${strings('artistGalleryPage.title', {artist: name})}

      -

      ${strings('artistGalleryPage.infoLine', { +

      ${language.$('artistGalleryPage.title', {artist: name})}

      +

      ${language.$('artistGalleryPage.infoLine', { coverArts: language.countCoverArts(artThingsGallery.length, {unit: true}) })}

      @@ -497,10 +497,10 @@ function generateNavForArtist(artist, isGallery, hasGallery, { wikiInfo.enableListings && { path: ['localized.listingIndex'], - title: strings('listingIndex.title') + title: language.$('listingIndex.title') }, { - html: strings('artistPage.nav.artist', { + html: language.$('artistPage.nav.artist', { artist: link.artist(artist, {class: 'current'}) }) }, diff --git a/src/page/flash.js b/src/page/flash.js index 54653a0..5e027f7 100644 --- a/src/page/flash.js +++ b/src/page/flash.js @@ -36,20 +36,20 @@ export function write(flash, {wikiData}) { strings, transformInline }) => ({ - title: strings('flashPage.title', {flash: flash.name}), + title: language.$('flashPage.title', {flash: flash.name}), theme: getThemeString(flash.color, [ `--flash-directory: ${flash.directory}` ]), main: { content: fixWS` -

      ${strings('flashPage.title', {flash: flash.name})}

      +

      ${language.$('flashPage.title', {flash: flash.name})}

      ${generateCoverLink({ src: getFlashCover(flash), - alt: strings('misc.alt.flashArt') + alt: language.$('misc.alt.flashArt') })} -

      ${strings('releaseInfo.released', {date: strings.count.date(flash.date)})}

      - ${(flash.page || flash.urls?.length) && `

      ${strings('releaseInfo.playOn', { +

      ${language.$('releaseInfo.released', {date: strings.count.date(flash.date)})}

      + ${(flash.page || flash.urls?.length) && `

      ${language.$('releaseInfo.playOn', { links: strings.list.or([ flash.page && getFlashLink(flash), ...flash.urls ?? [] @@ -59,10 +59,10 @@ export function write(flash, {wikiData}) {

      Tracks featured in ${flash.name.replace(/\.$/, '')}:

        ${(flash.featuredTracks - .map(track => strings('trackList.item.withArtists', { + .map(track => language.$('trackList.item.withArtists', { track: link.track(track), by: `${ - strings('trackList.item.withArtists.by', { + language.$('trackList.item.withArtists.by', { artists: getArtistString(track.artistContribs) }) }` @@ -72,7 +72,7 @@ export function write(flash, {wikiData}) {
      `} ${flash.contributorContribs.length && fixWS` -

      ${strings('releaseInfo.contributors')}

      +

      ${language.$('releaseInfo.contributors')}

        ${flash.contributorContribs .map(contrib => `
      • ${getArtistString([contrib], { @@ -111,14 +111,14 @@ export function writeTargetless({wikiData}) { link, strings }) => ({ - title: strings('flashIndex.title'), + title: language.$('flashIndex.title'), main: { classes: ['flash-index'], content: fixWS` -

        ${strings('flashIndex.title')}

        +

        ${language.$('flashIndex.title')}

        -

        ${strings('misc.jumpTo')}

        +

        ${language.$('misc.jumpTo')}

          ${flashActData.filter(act => act.jump).map(({ anchor, jump, jumpColor }) => fixWS`
        • ${jump}
          • @@ -165,10 +165,10 @@ function generateNavForFlash(flash, { {toHome: true}, { path: ['localized.flashIndex'], - title: strings('flashIndex.title') + title: language.$('flashIndex.title') }, { - html: strings('flashPage.nav.flash', { + html: language.$('flashPage.nav.flash', { flash: link.flash(flash, {class: 'current'}) }) }, @@ -211,7 +211,7 @@ function generateSidebarForFlash(flash, {link, strings, wikiData}) { return { content: fixWS` -

          ${link.flashIndex('', {text: strings('flashIndex.title')})}

          +

          ${link.flashIndex('', {text: language.$('flashIndex.title')})}

          ${flashActData.filter(act => act.name.startsWith('Act 1') || diff --git a/src/page/group.js b/src/page/group.js index 7ffade6..53c792a 100644 --- a/src/page/group.js +++ b/src/page/group.js @@ -42,44 +42,44 @@ export function write(group, {wikiData}) { strings, transformMultiline }) => ({ - title: strings('groupInfoPage.title', {group: group.name}), + title: language.$('groupInfoPage.title', {group: group.name}), theme: getThemeString(group.color), main: { content: fixWS` -

          ${strings('groupInfoPage.title', {group: group.name})}

          +

          ${language.$('groupInfoPage.title', {group: group.name})}

          ${group.urls?.length && `

          ${ - strings('releaseInfo.visitOn', { + language.$('releaseInfo.visitOn', { links: strings.list.or(group.urls.map(url => fancifyURL(url, {strings}))) }) }

          `}
          ${transformMultiline(group.description)}
          -

          ${strings('groupInfoPage.albumList.title')}

          +

          ${language.$('groupInfoPage.albumList.title')}

          ${ - strings('groupInfoPage.viewAlbumGallery', { + language.$('groupInfoPage.viewAlbumGallery', { link: link.groupGallery(group, { - text: strings('groupInfoPage.viewAlbumGallery.link') + text: language.$('groupInfoPage.viewAlbumGallery.link') }) }) }

            ${albumLines.map(({ album, otherGroup }) => { const item = (album.date - ? strings('groupInfoPage.albumList.item', { + ? language.$('groupInfoPage.albumList.item', { year: album.date.getFullYear(), album: link.album(album) }) - : strings('groupInfoPage.albumList.item.withoutYear', { + : language.$('groupInfoPage.albumList.item.withoutYear', { album: link.album(album) })); return html.tag('li', (otherGroup - ? strings('groupInfoPage.albumList.item.withAccent', { + ? language.$('groupInfoPage.albumList.item.withAccent', { item, accent: html.tag('span', {class: 'other-group-accent'}, - strings('groupInfoPage.albumList.item.otherGroupAccent', { + language.$('groupInfoPage.albumList.item.otherGroupAccent', { group: link.groupInfo(otherGroup, {color: false}) })) }) @@ -118,15 +118,15 @@ export function write(group, {wikiData}) { link, strings }) => ({ - title: strings('groupGalleryPage.title', {group: group.name}), + title: language.$('groupGalleryPage.title', {group: group.name}), theme: getThemeString(group.color), main: { classes: ['top-index'], content: fixWS` -

            ${strings('groupGalleryPage.title', {group: group.name})}

            +

            ${language.$('groupGalleryPage.title', {group: group.name})}

            ${ - strings('groupGalleryPage.infoLine', { + language.$('groupGalleryPage.infoLine', { tracks: `${language.countTracks(tracks.length, {unit: true})}`, albums: `${language.countAlbums(albums.length, {unit: true})}`, time: `${strings.count.duration(totalDuration, {unit: true})}` @@ -134,9 +134,9 @@ export function write(group, {wikiData}) { }

            ${wikiInfo.enableGroupUI && wikiInfo.enableListings && html.tag('p', {class: 'quick-info'}, - strings('groupGalleryPage.anotherGroupLine', { + language.$('groupGalleryPage.anotherGroupLine', { link: link.listing(listingSpec.find(l => l.directory === 'groups/by-category'), { - text: strings('groupGalleryPage.anotherGroupLine.link') + text: language.$('groupGalleryPage.anotherGroupLine.link') }) }) )} @@ -187,7 +187,7 @@ function generateGroupSidebar(currentGroup, isGallery, { return { content: fixWS` -

            ${strings('groupSidebar.title')}

            +

            ${language.$('groupSidebar.title')}

            ${groupCategoryData.map(category => html.tag('details', { open: category === currentGroup.category, @@ -195,7 +195,7 @@ function generateGroupSidebar(currentGroup, isGallery, { }, [ html.tag('summary', {style: getLinkThemeString(category.color)}, - strings('groupSidebar.groupList.category', { + language.$('groupSidebar.groupList.category', { category: `${category.name}` })), html.tag('ul', @@ -204,7 +204,7 @@ function generateGroupSidebar(currentGroup, isGallery, { class: group === currentGroup && 'current', style: getLinkThemeString(group.color) }, - strings('groupSidebar.groupList.item', { + language.$('groupSidebar.groupList.item', { group: link[linkKey](group) })))) ])).join('\n')} @@ -245,10 +245,10 @@ function generateGroupNav(currentGroup, isGallery, { wikiInfo.enableListings && { path: ['localized.listingIndex'], - title: strings('listingIndex.title') + title: language.$('listingIndex.title') }, { - html: strings('groupPage.nav.group', { + html: language.$('groupPage.nav.group', { group: link[linkKey](currentGroup, {class: 'current'}) }) }, diff --git a/src/page/homepage.js b/src/page/homepage.js index 8b470e9..ed7d344 100644 --- a/src/page/homepage.js +++ b/src/page/homepage.js @@ -84,14 +84,14 @@ export function writeTargetless({wikiData}) { // (even though that would 8e hilarious). content: (transformMultiline(homepageLayout.sidebarContent.replace('[[news]]', '__GENERATE_NEWS__')) .replace('

            __GENERATE_NEWS__

            ', wikiInfo.enableNews ? fixWS` -

            ${strings('homepage.news.title')}

            +

            ${language.$('homepage.news.title')}

            ${newsData.slice(0, 3).map((entry, i) => html.tag('article', {class: ['news-entry', i === 0 && 'first-news-entry']}, fixWS`

            ${link.newsEntry(entry)}

            ${transformMultiline(entry.contentShort)} ${entry.contentShort !== entry.content && link.newsEntry(entry, { - text: strings('homepage.news.entry.viewRest') + text: language.$('homepage.news.entry.viewRest') })} `)).join('\n')} ` : `

            News requested in content description but this feature isn't enabled

            `)) @@ -103,11 +103,11 @@ export function writeTargetless({wikiData}) { ${[ link.home('', {text: wikiInfo.nameShort, class: 'current', to}), wikiInfo.enableListings && - link.listingIndex('', {text: strings('listingIndex.title'), to}), + link.listingIndex('', {text: language.$('listingIndex.title'), to}), wikiInfo.enableNews && - link.newsIndex('', {text: strings('newsIndex.title'), to}), + link.newsIndex('', {text: language.$('newsIndex.title'), to}), wikiInfo.enableFlashesAndGames && - link.flashIndex('', {text: strings('flashIndex.title'), to}), + link.flashIndex('', {text: language.$('flashIndex.title'), to}), ...(staticPageData .filter(page => page.showInNavigationBar) .map(page => link.staticPage(page, {text: page.nameShort}))) diff --git a/src/page/listing.js b/src/page/listing.js index dbac4b7..efa3fdf 100644 --- a/src/page/listing.js +++ b/src/page/listing.js @@ -47,11 +47,11 @@ export function write(listing, {wikiData}) { const titleKey = `listingPage.${listing.stringsKey}.title`; return { - title: strings(titleKey), + title: language.$(titleKey), main: { content: fixWS` -

            ${strings(titleKey)}

            +

            ${language.$(titleKey)}

            ${listing.html && (listing.data ? listing.html(data, opts) : listing.html(opts))} @@ -80,7 +80,7 @@ export function write(listing, {wikiData}) { {toHome: true}, { path: ['localized.listingIndex'], - title: strings('listingIndex.title') + title: language.$('listingIndex.title') }, {toCurrentPage: true} ] @@ -105,19 +105,19 @@ export function writeTargetless({wikiData}) { strings, link }) => ({ - title: strings('listingIndex.title'), + title: language.$('listingIndex.title'), main: { content: fixWS` -

            ${strings('listingIndex.title')}

            -

            ${strings('listingIndex.infoLine', { +

            ${language.$('listingIndex.title')}

            +

            ${language.$('listingIndex.infoLine', { wiki: wikiInfo.name, tracks: `${language.countTracks(trackData.length, {unit: true})}`, albums: `${language.countAlbums(albumData.length, {unit: true})}`, duration: `${strings.count.duration(totalDuration, {approximate: true, unit: true})}` })}

            -

            ${strings('listingIndex.exploreList')}

            +

            ${language.$('listingIndex.exploreList')}

            ${generateLinkIndexForListings(null, false, {link, strings, wikiData})} ` }, @@ -147,7 +147,7 @@ function generateSidebarForListings(currentListing, { wikiData }) { return fixWS` -

            ${link.listingIndex('', {text: strings('listingIndex.title')})}

            +

            ${link.listingIndex('', {text: language.$('listingIndex.title')})}

            ${generateLinkIndexForListings(currentListing, true, { getLinkThemeString, link, @@ -175,7 +175,7 @@ function generateLinkIndexForListings(currentListing, forSidebar, { const genUL = listings => html.tag('ul', listings.map(listing => html.tag('li', {class: [listing === currentListing && 'current']}, - link.listing(listing, {text: strings(`listingPage.${listing.stringsKey}.title.short`)}) + link.listing(listing, {text: language.$(`listingPage.${listing.stringsKey}.title.short`)}) ))); if (forSidebar) { diff --git a/src/page/news.js b/src/page/news.js index 759bb93..9951a2a 100644 --- a/src/page/news.js +++ b/src/page/news.js @@ -24,13 +24,13 @@ export function write(entry, {wikiData}) { strings, transformMultiline, }) => ({ - title: strings('newsEntryPage.title', {entry: entry.name}), + title: language.$('newsEntryPage.title', {entry: entry.name}), main: { content: fixWS`
            -

            ${strings('newsEntryPage.title', {entry: entry.name})}

            -

            ${strings('newsEntryPage.published', {date: strings.count.date(entry.date)})}

            +

            ${language.$('newsEntryPage.title', {entry: entry.name})}

            +

            ${language.$('newsEntryPage.published', {date: strings.count.date(entry.date)})}

            ${transformMultiline(entry.content)}
            ` @@ -59,18 +59,18 @@ export function writeTargetless({wikiData}) { strings, transformMultiline }) => ({ - title: strings('newsIndex.title'), + title: language.$('newsIndex.title'), main: { content: fixWS`
            -

            ${strings('newsIndex.title')}

            +

            ${language.$('newsIndex.title')}

            ${newsData.map(entry => fixWS`

            ${link.newsEntry(entry)}

            ${transformMultiline(entry.contentShort)} ${entry.contentShort !== entry.content && `

            ${link.newsEntry(entry, { - text: strings('newsIndex.entry.viewRest') + text: language.$('newsIndex.entry.viewRest') })}

            `}
            `).join('\n')} @@ -108,10 +108,10 @@ function generateNewsEntryNav(entry, { {toHome: true}, { path: ['localized.newsIndex'], - title: strings('newsEntryPage.nav.news') + title: language.$('newsEntryPage.nav.news') }, { - html: strings('newsEntryPage.nav.entry', { + html: language.$('newsEntryPage.nav.entry', { date: strings.count.date(entry.date), entry: link.newsEntry(entry, {class: 'current'}) }) diff --git a/src/page/tag.js b/src/page/tag.js index 09d0beb..af2e394 100644 --- a/src/page/tag.js +++ b/src/page/tag.js @@ -37,14 +37,14 @@ export function write(tag, {wikiData}) { strings, to }) => ({ - title: strings('tagPage.title', {tag: tag.name}), + title: language.$('tagPage.title', {tag: tag.name}), theme: getThemeString(tag.color), main: { classes: ['top-index'], content: fixWS` -

            ${strings('tagPage.title', {tag: tag.name})}

            -

            ${strings('tagPage.infoLine', { +

            ${language.$('tagPage.title', {tag: tag.name})}

            +

            ${language.$('tagPage.infoLine', { coverArts: language.countCoverArts(things.length, {unit: true}) })}

            @@ -92,10 +92,10 @@ function generateTagNav(tag, { wikiData.wikiInfo.enableListings && { path: ['localized.listingIndex'], - title: strings('listingIndex.title') + title: language.$('listingIndex.title') }, { - html: strings('tagPage.nav.tag', { + html: language.$('tagPage.nav.tag', { tag: link.tag(tag, {class: 'current'}) }) }, diff --git a/src/page/track.js b/src/page/track.js index c27b2b6..92a49ff 100644 --- a/src/page/track.js +++ b/src/page/track.js @@ -52,14 +52,14 @@ export function write(track, {wikiData}) { const unbound_generateTrackList = (tracks, {getArtistString, link, strings}) => html.tag('ul', tracks.map(track => { - const line = strings('trackList.item.withArtists', { + const line = language.$('trackList.item.withArtists', { track: link.track(track), - by: `${strings('trackList.item.withArtists.by', { + by: `${language.$('trackList.item.withArtists.by', { artists: getArtistString(track.artistContribs) })}` }); return (track.aka - ? `
          • ${strings('trackList.item.rerelease', {track: line})}
            • ` + ? `
          • ${language.$('trackList.item.rerelease', {track: line})}
            • ` : `
          • ${line}
            • `); }) ); @@ -76,7 +76,7 @@ export function write(track, {wikiData}) { .filter(line => line.replace(/<\/b>/g, '').includes(':')) .map(line => fixWS` ${line} - ${strings('releaseInfo.artistCommentary.seeOriginalRelease', { + ${language.$('releaseInfo.artistCommentary.seeOriginalRelease', { original: link.track(track) })} `) @@ -140,7 +140,7 @@ export function write(track, {wikiData}) { const cover = getTrackCover(track); return { - title: strings('trackPage.title', {track: track.name}), + title: language.$('trackPage.title', {track: track.name}), stylesheet: getAlbumStylesheet(album, {to}), theme: getThemeString(track.color, [ `--album-directory: ${album.directory}`, @@ -153,7 +153,7 @@ export function write(track, {wikiData}) { classes: ['dim'], dimensions: album.bannerDimensions, path: ['media.albumBanner', album.directory, album.bannerFileExtension], - alt: strings('misc.alt.albumBanner'), + alt: language.$('misc.alt.albumBanner'), position: 'bottom' }, */ @@ -162,49 +162,49 @@ export function write(track, {wikiData}) { content: fixWS` ${cover && generateCoverLink({ src: cover, - alt: strings('misc.alt.trackCover'), + alt: language.$('misc.alt.trackCover'), tags: track.artTags })} -

            ${strings('trackPage.title', {track: track.name})}

            +

            ${language.$('trackPage.title', {track: track.name})}

            ${[ - strings('releaseInfo.by', { + language.$('releaseInfo.by', { artists: getArtistString(track.artistContribs, { showContrib: true, showIcons: true }) }), - track.coverArtistContribs.length && strings('releaseInfo.coverArtBy', { + track.coverArtistContribs.length && language.$('releaseInfo.coverArtBy', { artists: getArtistString(track.coverArtistContribs, { showContrib: true, showIcons: true }) }), - track.date && strings('releaseInfo.released', { + track.date && language.$('releaseInfo.released', { date: strings.count.date(track.date) }), (track.coverArtDate && +track.coverArtDate !== +track.date && - strings('releaseInfo.artReleased', { + language.$('releaseInfo.artReleased', { date: strings.count.date(track.coverArtDate) })), - track.duration && strings('releaseInfo.duration', { + track.duration && language.$('releaseInfo.duration', { duration: strings.count.duration(track.duration) }) ].filter(Boolean).join('
            \n')}

            ${ (track.urls?.length - ? strings('releaseInfo.listenOn', { + ? language.$('releaseInfo.listenOn', { links: strings.list.or(track.urls.map(url => fancifyURL(url, {strings}))) }) - : strings('releaseInfo.listenOn.noLinks')) + : language.$('releaseInfo.listenOn.noLinks')) }

            ${otherReleases.length && fixWS` -

            ${strings('releaseInfo.alsoReleasedAs')}

            +

            ${language.$('releaseInfo.alsoReleasedAs')}

              ${otherReleases.map(track => fixWS` -
            • ${strings('releaseInfo.alsoReleasedAs.item', { +
            • ${language.$('releaseInfo.alsoReleasedAs.item', { track: link.track(track), album: link.album(track.album) })}
              • @@ -212,7 +212,7 @@ export function write(track, {wikiData}) {
            `} ${track.contributorContribs.length && fixWS` -

            ${strings('releaseInfo.contributors')}

            +

            ${language.$('releaseInfo.contributors')}

              ${(track.contributorContribs .map(contrib => `
            • ${getArtistString([contrib], { @@ -223,19 +223,19 @@ export function write(track, {wikiData}) {
            `} ${referencedTracks.length && fixWS` -

            ${strings('releaseInfo.tracksReferenced', {track: `${track.name}`})}

            +

            ${language.$('releaseInfo.tracksReferenced', {track: `${track.name}`})}

            ${generateTrackList(referencedTracks)} `} ${referencedByTracks.length && fixWS` -

            ${strings('releaseInfo.tracksThatReference', {track: `${track.name}`})}

            +

            ${language.$('releaseInfo.tracksThatReference', {track: `${track.name}`})}

            ${useDividedReferences && fixWS`
            ${rbtOfficial.length && fixWS` -
            ${strings('trackPage.referenceList.official')}
            +
            ${language.$('trackPage.referenceList.official')}
            ${generateTrackList(rbtOfficial)}
            `} ${rbtFanon.length && fixWS` -
            ${strings('trackPage.referenceList.fandom')}
            +
            ${language.$('trackPage.referenceList.fandom')}
            ${generateTrackList(rbtFanon)}
            `}
            @@ -243,28 +243,28 @@ export function write(track, {wikiData}) { ${!useDividedReferences && generateTrackList(referencedByTracks)} `} ${wikiInfo.enableFlashesAndGames && flashesThatFeature.length && fixWS` -

            ${strings('releaseInfo.flashesThatFeature', {track: `${track.name}`})}

            +

            ${language.$('releaseInfo.flashesThatFeature', {track: `${track.name}`})}

              ${flashesThatFeature.map(({ flash, as }) => html.tag('li', {class: as !== track && 'rerelease'}, (as === track - ? strings('releaseInfo.flashesThatFeature.item', { + ? language.$('releaseInfo.flashesThatFeature.item', { flash: link.flash(flash) }) - : strings('releaseInfo.flashesThatFeature.item.asDifferentRelease', { + : language.$('releaseInfo.flashesThatFeature.item.asDifferentRelease', { flash: link.flash(flash), track: link.track(as) })))).join('\n')}
            `} ${track.lyrics && fixWS` -

            ${strings('releaseInfo.lyrics')}

            +

            ${language.$('releaseInfo.lyrics')}

            ${transformLyrics(track.lyrics)}
            `} ${hasCommentary && fixWS` -

            ${strings('releaseInfo.artistCommentary')}

            +

            ${language.$('releaseInfo.artistCommentary')}

            ${generateCommentary({link, strings, transformMultiline})}
            @@ -289,12 +289,12 @@ export function write(track, {wikiData}) { title: album.name }, listTag === 'ol' ? { - html: strings('trackPage.nav.track.withNumber', { + html: language.$('trackPage.nav.track.withNumber', { number: album.tracks.indexOf(track) + 1, track: link.track(track, {class: 'current', to}) }) } : { - html: strings('trackPage.nav.track', { + html: language.$('trackPage.nav.track', { track: link.track(track, {class: 'current', to}) }) }, -- cgit 1.3.0-6-gf8a5