« 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/data/composite/things/track/trackReverseReferenceList.js8
-rw-r--r--src/data/things/track.js10
-rw-r--r--test/unit/data/things/track.js4
3 files changed, 11 insertions, 11 deletions
diff --git a/src/data/composite/things/track/trackReverseReferenceList.js b/src/data/composite/things/track/trackReverseReferenceList.js
index e7bfedf3..44940ae7 100644
--- a/src/data/composite/things/track/trackReverseReferenceList.js
+++ b/src/data/composite/things/track/trackReverseReferenceList.js
@@ -1,8 +1,8 @@
 // Like a normal reverse reference list ("objects which reference this object
-// under a specified property"), only excluding re-releases from the possible
-// outputs. While it's useful to travel from a re-release to the tracks it
-// references, re-releases aren't generally relevant from the perspective of
-// the tracks *being* referenced. Apart from hiding re-releases from lists on
+// under a specified property"), only excluding rereleases from the possible
+// outputs. While it's useful to travel from a rerelease to the tracks it
+// references, rereleases aren't generally relevant from the perspective of
+// the tracks *being* referenced. Apart from hiding rereleases from lists on
 // the site, it also excludes keeps them from relational data processing, such
 // as on the "Tracks - by Times Referenced" listing page.
 
diff --git a/src/data/things/track.js b/src/data/things/track.js
index d4ce7790..9b2dbd6d 100644
--- a/src/data/things/track.js
+++ b/src/data/things/track.js
@@ -431,27 +431,27 @@ export class Track extends Thing {
     },
 
     invalidFieldCombinations: [
-      {message: `Re-releases inherit references from the original`, fields: [
+      {message: `Rereleases inherit references from the original`, fields: [
         'Originally Released As',
         'Referenced Tracks',
       ]},
 
-      {message: `Re-releases inherit samples from the original`, fields: [
+      {message: `Rereleases inherit samples from the original`, fields: [
         'Originally Released As',
         'Sampled Tracks',
       ]},
 
-      {message: `Re-releases inherit artists from the original`, fields: [
+      {message: `Rereleases inherit artists from the original`, fields: [
         'Originally Released As',
         'Artists',
       ]},
 
-      {message: `Re-releases inherit contributors from the original`, fields: [
+      {message: `Rereleases inherit contributors from the original`, fields: [
         'Originally Released As',
         'Contributors',
       ]},
 
-      {message: `Re-releases inherit lyrics from the original`, fields: [
+      {message: `Rereleases inherit lyrics from the original`, fields: [
         'Originally Released As',
         'Lyrics',
       ]},
diff --git a/test/unit/data/things/track.js b/test/unit/data/things/track.js
index 0abb37cf..15673437 100644
--- a/test/unit/data/things/track.js
+++ b/test/unit/data/things/track.js
@@ -720,7 +720,7 @@ t.test(`Track.referencedByTracks`, t => {
   XXX_decacheWikiData();
 
   t.same(track1.referencedByTracks, [track2],
-    `referencedByTracks #4: doesn't include re-releases`);
+    `referencedByTracks #4: doesn't include rereleases`);
 });
 
 t.test(`Track.sampledByTracks`, t => {
@@ -756,5 +756,5 @@ t.test(`Track.sampledByTracks`, t => {
   XXX_decacheWikiData();
 
   t.same(track1.sampledByTracks, [track2],
-    `sampledByTracks #4: doesn't include re-releases`);
+    `sampledByTracks #4: doesn't include rereleases`);
 });