From a99f53466600ddf00945d111409179e50af00a67 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Thu, 15 Aug 2024 13:10:58 -0300
Subject: content: gRIContributionsLine: wiki edit annotations

---
 .../generateReleaseInfoContributionsLine.js          |  4 ++--
 ...erateReleaseInfoContributionsLineWikiEditsPart.js | 20 ++++++++++----------
 src/strings-default.yaml                             |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/content/dependencies/generateReleaseInfoContributionsLine.js b/src/content/dependencies/generateReleaseInfoContributionsLine.js
index 195b94f3..c2eb6a46 100644
--- a/src/content/dependencies/generateReleaseInfoContributionsLine.js
+++ b/src/content/dependencies/generateReleaseInfoContributionsLine.js
@@ -11,11 +11,11 @@ export default {
   query: (contributions) => ({
     normalContributions:
       contributions
-        .filter(contrib => contrib.annotation !== 'edits for wiki'),
+        .filter(contrib => !contrib.annotation?.startsWith(`edits for wiki`)),
 
     wikiEditContributions:
       contributions
-        .filter(contrib => contrib.annotation === 'edits for wiki'),
+        .filter(contrib => contrib.annotation?.startsWith(`edits for wiki`)),
   }),
 
   relations: (relation, query, _contributions) => ({
diff --git a/src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js b/src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js
index c5c52fa0..a2a103b6 100644
--- a/src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js
+++ b/src/content/dependencies/generateReleaseInfoContributionsLineWikiEditsPart.js
@@ -5,7 +5,7 @@ export default {
     'linkContribution',
   ],
 
-  extraDependencies: ['html', 'language'],
+  extraDependencies: ['language'],
 
   relations: (relation, contributions) => ({
     textWithTooltip:
@@ -19,7 +19,7 @@ export default {
         .map(contrib => relation('linkContribution', contrib)),
   }),
 
-  generate: (relations, {html, language}) =>
+  generate: (relations, {language}) =>
     language.encapsulate('misc.artistLink.withEditsForWiki', capsule =>
       relations.textWithTooltip.slots({
         attributes:
@@ -34,18 +34,18 @@ export default {
               {class: 'wiki-edits-tooltip'},
 
             content:
-              html.tags(
-                relations.contributionLinks.map(link =>
-                  language.$(capsule, 'editsLine', {
-                    artist:
+              language.$(capsule, 'editsLine', {
+                [language.onlyIfOptions]: ['artists'],
+
+                artists:
+                  language.formatConjunctionList(
+                    relations.contributionLinks.map(link =>
                       link.slots({
                         showAnnotation: true,
                         trimAnnotation: true,
                         preventTooltip: true,
-                      }),
-                  })),
-
-                {[html.joinChildren]: html.tag('br')}),
+                      }))),
+                }),
           }),
       })),
 };
diff --git a/src/strings-default.yaml b/src/strings-default.yaml
index 144c1dd1..0dc86ef0 100644
--- a/src/strings-default.yaml
+++ b/src/strings-default.yaml
@@ -496,7 +496,7 @@ misc:
     withEditsForWiki:
       _: "{ARTISTS} ({EDITS})"
       edits: "+ edits"
-      editsLine: "Edits for wiki by {ARTIST}"
+      editsLine: "Edits for wiki by {ARTISTS}"
 
     # Displayed in an artist's tooltip, if one of their URLs
     # isn't a specially detected web platform.
-- 
cgit 1.3.0-6-gf8a5