« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/misc-templates.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/misc-templates.js')
-rw-r--r--src/misc-templates.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/misc-templates.js b/src/misc-templates.js
index 3c0b2b7..93d9eab 100644
--- a/src/misc-templates.js
+++ b/src/misc-templates.js
@@ -35,13 +35,13 @@ export function getArtistString(artists, {
     showIcons = false,
     showContrib = false
 }) {
-    return strings.list.and(artists.map(({ who, what }) => {
+    return language.formatConjunctionList(artists.map(({ who, what }) => {
         const { urls, directory, name } = who;
         return [
             link.artist(who),
             showContrib && what && `(${what})`,
             showIcons && urls?.length && `<span class="icons">(${
-                strings.list.unit(urls.map(url => iconifyURL(url, {strings})))
+                language.formatUnitList(urls.map(url => iconifyURL(url, {strings})))
             })</span>`
         ].filter(Boolean).join(' ');
     }));
@@ -117,7 +117,7 @@ export function getRevealStringFromWarnings(warnings, {strings}) {
 
 export function getRevealStringFromTags(tags, {strings}) {
     return tags && tags.some(tag => tag.isContentWarning) && (
-        getRevealStringFromWarnings(strings.list.unit(tags.filter(tag => tag.isContentWarning).map(tag => tag.name)), {strings}));
+        getRevealStringFromWarnings(language.formatUnitList(tags.filter(tag => tag.isContentWarning).map(tag => tag.name)), {strings}));
 }
 
 // Cover art links