« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/content/dependencies/generateAlbumGalleryPage.js2
-rw-r--r--src/content/dependencies/generateArtTagGalleryPage.js2
-rw-r--r--src/content/dependencies/generateArtistGalleryPage.js2
-rw-r--r--src/content/dependencies/generateCoverGrid.js14
-rw-r--r--src/content/dependencies/generateGroupGalleryPage.js4
-rw-r--r--src/content/dependencies/generateWikiHomeAlbumsRow.js2
-rw-r--r--src/strings-default.yaml12
7 files changed, 24 insertions, 14 deletions
diff --git a/src/content/dependencies/generateAlbumGalleryPage.js b/src/content/dependencies/generateAlbumGalleryPage.js
index 44d49c54..b48d92af 100644
--- a/src/content/dependencies/generateAlbumGalleryPage.js
+++ b/src/content/dependencies/generateAlbumGalleryPage.js
@@ -200,7 +200,7 @@ export default {
                 data.coverArtists.map(names =>
                   (names === null
                     ? null
-                    : language.$('misc.albumGrid.details.coverArtists', {
+                    : language.$('misc.coverGrid.details.coverArtists', {
                         artists: language.formatUnitList(names),
                       }))),
             }),
diff --git a/src/content/dependencies/generateArtTagGalleryPage.js b/src/content/dependencies/generateArtTagGalleryPage.js
index c51faeba..d55a628b 100644
--- a/src/content/dependencies/generateArtTagGalleryPage.js
+++ b/src/content/dependencies/generateArtTagGalleryPage.js
@@ -125,7 +125,7 @@ export default {
                 data.coverArtists.map(names =>
                   (names === null
                     ? null
-                    : language.$('misc.albumGrid.details.coverArtists', {
+                    : language.$('misc.coverGrid.details.coverArtists', {
                         artists: language.formatUnitList(names),
                       }))),
             }),
diff --git a/src/content/dependencies/generateArtistGalleryPage.js b/src/content/dependencies/generateArtistGalleryPage.js
index 650b4354..7a76188a 100644
--- a/src/content/dependencies/generateArtistGalleryPage.js
+++ b/src/content/dependencies/generateArtistGalleryPage.js
@@ -126,7 +126,7 @@ export default {
                 data.otherCoverArtists.map(names =>
                   (names === null
                     ? null
-                    : language.$('misc.albumGrid.details.otherCoverArtists', {
+                    : language.$('misc.coverGrid.details.otherCoverArtists', {
                         artists: language.formatUnitList(names),
                       }))),
             }),
diff --git a/src/content/dependencies/generateCoverGrid.js b/src/content/dependencies/generateCoverGrid.js
index 0433aaf1..fa9b3dda 100644
--- a/src/content/dependencies/generateCoverGrid.js
+++ b/src/content/dependencies/generateCoverGrid.js
@@ -44,11 +44,19 @@ export default {
                       : false),
                 }),
 
-                html.tag('span', {[html.onlyIfContent]: true},
+                html.tag('span',
+                  {[html.onlyIfContent]: true},
+
                   language.sanitize(name)),
 
-                html.tag('span', {[html.onlyIfContent]: true},
-                  language.sanitize(info)),
+                html.tag('span',
+                  {[html.onlyIfContent]: true},
+
+                  language.$('misc.coverGrid.details.accent', {
+                    [language.onlyIfOptions]: ['details'],
+
+                    details: info,
+                  })),
               ],
             })),
 
diff --git a/src/content/dependencies/generateGroupGalleryPage.js b/src/content/dependencies/generateGroupGalleryPage.js
index ceb54322..79746cd0 100644
--- a/src/content/dependencies/generateGroupGalleryPage.js
+++ b/src/content/dependencies/generateGroupGalleryPage.js
@@ -168,7 +168,7 @@ export default {
                     image.slots({
                       path,
                       missingSourceContent:
-                        language.$('misc.albumGrid.noCoverArt', {
+                        language.$('misc.coverGrid.noCoverArt', {
                           album: name,
                         }),
                     })),
@@ -177,7 +177,7 @@ export default {
                   numTracks: data.gridNumTracks,
                   duration: data.gridDurations,
                 }).map(({numTracks, duration}) =>
-                    language.$('misc.albumGrid.details', {
+                    language.$('misc.coverGrid.details.albumLength', {
                       tracks: language.countTracks(numTracks, {unit: true}),
                       time: language.formatDuration(duration),
                     })),
diff --git a/src/content/dependencies/generateWikiHomeAlbumsRow.js b/src/content/dependencies/generateWikiHomeAlbumsRow.js
index 16c22bb3..84ed5545 100644
--- a/src/content/dependencies/generateWikiHomeAlbumsRow.js
+++ b/src/content/dependencies/generateWikiHomeAlbumsRow.js
@@ -113,7 +113,7 @@ export default {
           image.slots({
             path,
             missingSourceContent:
-              language.$('misc.albumGrid.noCoverArt', {
+              language.$('misc.coverGrid.noCoverArt', {
                 [language.onlyIfOptions]: ['album'],
                 album: name,
               }),
diff --git a/src/strings-default.yaml b/src/strings-default.yaml
index 5ccd05cc..600d62a1 100644
--- a/src/strings-default.yaml
+++ b/src/strings-default.yaml
@@ -862,20 +862,22 @@ misc:
     warnings: "{WARNINGS}"
     reveal: "click to show"
 
-  # albumGrid:
+  # coverGrid:
   #   Generic strings for various sorts of gallery grids, displayed
   #   on the homepage, album galleries, artist artwork galleries, and
   #   so on. These get the name of the thing being represented and,
   #   often, a bit of text providing pertinent extra details about
   #   that thing.
 
-  albumGrid:
+  coverGrid:
     noCoverArt: "{ALBUM}"
 
     details:
-      _: "({TRACKS}, {TIME})"
-      coverArtists: "(Illust. {ARTISTS})"
-      otherCoverArtists: "(With {ARTISTS})"
+      accent: "({DETAILS})"
+
+      albumLength: "{TRACKS}, {TIME}"
+      coverArtists: "Illust. {ARTISTS}"
+      otherCoverArtists: "With {ARTISTS}"
 
   albumGalleryGrid:
     noCoverArt: "{NAME}"