Merge branch 'sabrecat/customizations' into subs-private

website/common/script/content/appearance/backgrounds.js

@@ -666,7 +666,7 @@ const releaseDates = {
   backgrounds012024: '2024-01-04T08:00-05:00',
   backgrounds022024: '2024-02-06T08:00-05:00',
   backgrounds032024: '2024-03-05T08:00-05:00',
-  backgrounds042024: '2024-04-04T00:00-04:00',
+  backgrounds042024: '2023-04-04T00:00-04:00',
 };
 
 const flat = {};

website/common/script/content/appearance/hair/base.js

@@ -1,26 +1,27 @@
 import prefill from '../prefill';
 import sets from '../sets';
+import t from '../../translation';
 
 export default prefill({
   0: {},
-  1: {},
-  2: { price: 2, set: sets.baseHair1 },
-  3: {},
-  4: { price: 2, set: sets.baseHair1 },
-  5: { price: 2, set: sets.baseHair1 },
-  6: { price: 2, set: sets.baseHair1 },
-  7: { price: 2, set: sets.baseHair1 },
-  8: { price: 2, set: sets.baseHair1 },
-  9: { price: 2, set: sets.baseHair2 },
-  10: { price: 2, set: sets.baseHair2 },
-  11: { price: 2, set: sets.baseHair2 },
-  12: { price: 2, set: sets.baseHair2 },
-  13: { price: 2, set: sets.baseHair2 },
-  14: { price: 2, set: sets.baseHair2 },
-  15: { price: 2, set: sets.baseHair3 },
-  16: { price: 2, set: sets.baseHair3 },
-  17: { price: 2, set: sets.baseHair3 },
-  18: { price: 2, set: sets.baseHair3 },
-  19: { price: 2, set: sets.baseHair3 },
-  20: { price: 2, set: sets.baseHair3 },
+  1: { text: t('ponytail')},
+  2: { text: t('doublePonytail'), price: 2, set: sets.baseHair1 },
+  3: { text: t('braid') },
+  4: { text: t('doubleBraid'), price: 2, set: sets.baseHair1 },
+  5: { text: t('wavyLong'), price: 2, set: sets.baseHair1 },
+  6: { text: t('wavyShort'), price: 2, set: sets.baseHair1 },
+  7: { text: t('straightLong'), price: 2, set: sets.baseHair1 },
+  8: { text: t('straightShort'), price: 2, set: sets.baseHair1 },
+  9: { text: t('highPonytailLeft'), price: 2, set: sets.baseHair2 },
+  10: { text: t('leftBun'), price: 2, set: sets.baseHair2 },
+  11: { text: t('highPonytailRight'), price: 2, set: sets.baseHair2 },
+  12: { text: t('rightBun'), price: 2, set: sets.baseHair2 },
+  13: { text: t('doubleHighPonytail'), price: 2, set: sets.baseHair2 },
+  14: { text: t('doubleBun'), price: 2, set: sets.baseHair2 },
+  15: { text: t('updo'), price: 2, set: sets.baseHair3 },
+  16: { text: t('curlyLong'), price: 2, set: sets.baseHair3 },
+  17: { text: t('curlyShort'), price: 2, set: sets.baseHair3 },
+  18: { text: t('messy'), price: 2, set: sets.baseHair3 },
+  19: { text: t('mohawk'), price: 2, set: sets.baseHair3 },
+  20: { text: t('fauxhawk'), price: 2, set: sets.baseHair3 },
 });

website/common/script/content/appearance/hair/beard.js

@@ -1,9 +1,10 @@
-import sets from '../sets';
 import prefill from '../prefill';
+import sets from '../sets';
+import t from '../../translation';
 
 export default prefill({
   0: {},
-  1: { price: 2, set: sets.facialHair },
-  2: { price: 2, set: sets.facialHair },
-  3: { price: 2, set: sets.facialHair },
+  1: { text: t('goatee'), price: 2, set: sets.facialHair },
+  2: { text: t('shortBeard'), price: 2, set: sets.facialHair },
+  3: { text: t('longBeard'), price: 2, set: sets.facialHair },
 });

website/common/script/content/appearance/hair/mustache.js

@@ -1,8 +1,9 @@
-import sets from '../sets';
 import prefill from '../prefill';
+import sets from '../sets';
+import t from '../../translation';
 
 export default prefill({
   0: {},
-  1: { price: 2, set: sets.facialHair },
-  2: { price: 2, set: sets.facialHair },
+  1: { text: t('smallMustache'), price: 2, set: sets.facialHair },
+  2: { text: t('largeMustache'), price: 2, set: sets.facialHair },
 });

website/common/script/content/appearance/prefill.js

@@ -1,4 +1,5 @@
 import forOwn from 'lodash/forOwn';
+import t from '../translation';
 
 export default function prefillAppearances (obj) {
   forOwn(obj, (value, key) => {
@@ -6,6 +7,9 @@ export default function prefillAppearances (obj) {
     if (!value.price) {
       value.price = 0;
     }
+    if (!value.text) {
+      value.text = t(key);
+    }
   });
   return obj;
 }

website/common/script/content/constants/events.js

@@ -90,7 +90,7 @@ export const EVENTS = {
   },
   aprilFools2024: {
     start: '2024-04-01T00:00-04:00',
-    end: '2024-04-02T20:00-04:00',
+    end: '2024-04-02T08:00-04:00',
     aprilFools: 'Fungi',
   },
   spring2024: {

website/common/script/content/gear/sets/armoire.js

@@ -1806,7 +1806,7 @@ const releaseDates = {
   schoolUniform: '2024-01-04T08:00-05:00',
   whiteLoungeWear: '2024-02-06T08:00-05:00',
   hatterSet: '2024-03-05T08:00-05:00',
-  optimistSet: '2024-04-04T00:00-05:00',
+  optimistSet: '2024-03-05T00:00-05:00',
 };
 
 forEach({