content: gRIContributionsLine: wiki edit annotations

2 files changed, 12 insertions, 12 deletions

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')}),
+                      }))),
+                }),
           }),
       })),
 };