Merge branch 'develop' into release

package-lock.json

@@ -13777,9 +13777,9 @@
       }
     },
     "stripe": {
-      "version": "8.217.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.217.0.tgz",
-      "integrity": "sha512-CHWazNOrb1EBxTpepv5hCKMxOwF/oW3E4zRi8/LZIy5FC2y7A7NzcuE1aErYXLId3bKPe20HOmWKvjDRU2bXaA==",
+      "version": "8.219.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-8.219.0.tgz",
+      "integrity": "sha512-leQj9h2T4jhEz4Ta4irNTNgErPmXfF9h4nRYblTTrkTqldOmEWZQZIgXkNp1u6/UbOmMDRvxgh57UHyxwwfw0Q==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.10.3"

package.json

@@ -67,7 +67,7 @@
     "remove-markdown": "^0.3.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.0",
-    "stripe": "^8.217.0",
+    "stripe": "^8.219.0",
     "superagent": "^7.1.2",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",

website/client/src/components/creatorIntro.vue

@@ -159,7 +159,7 @@
           <toggle-switch
             v-model="filterBackgrounds"
             class="backgroundFilterToggle"
-            :label="'Hide locked backgrounds'"
+            :label="$t('hideLockedBackgrounds')"
           />
         </div>
         <div
@@ -247,6 +247,7 @@
           </div>
         </div>
         <sub-menu
+          v-if="!filterBackgrounds"
           class="text-center"
           :items="bgSubMenuItems"
           :active-sub-page="activeSubPage"

website/common/locales/en/backgrounds.json

@@ -3,6 +3,7 @@
   "background": "Background",
   "backgroundShop": "Background Shop",
   "noBackground": "No Background Selected",
+  "hideLockedBackgrounds": "Hide locked backgrounds",
 
   "backgrounds062014": "SET 1: Released June 2014",
   "backgroundBeachText": "Beach",

website/common/locales/en/questsContent.json

@@ -874,7 +874,7 @@
   "questVirtualPetCompletion": "Some careful button pushing seems to have fulfilled the virtual pet’s mysterious needs, and finally it has quieted down and appears content.<br><br>Suddenly in a burst of confetti, the April Fool appears with a basket full of strange potions emitting soft beeps.<br><br>“What timing, April Fool,” @Beffymaroo says with a wry smile. “I suspect this large beeping fellow is an acquaintance of yours.”<br><br>“Uh, yes,” the Fool says, sheepishly. “So sorry about that, and thank you both for taking care of Wotchimon! Take these potions in the way of thanks, they can bring your Virtual pets back anytime you like!”<br><br>You’re not 100% sure you’re on board with all the beeping, but they’re sure cute so it’s worth a shot!",
   "questVirtualPetBoss": "Wotchimon",
   "questVirtualPetRageTitle": "The Beepening",
-  "questVirtualPetRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Wotchiman will heal 30% of its remaining health!",
+  "questVirtualPetRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Wotchimon will take away some of your party's pending damage!",
   "questVirtualPetRageEffect": "`Wotchimon uses Bothersome Beep!` Wotchimon sounds a bothersome beep, and its happiness bar suddenly disappears! Pending damage reduced.",
   "questVirtualPetDropVirtualPetPotion": "Virtual Pet Hatching Potion",
   "questVirtualPetUnlockText": "Unlocks Virtual Pet Hatching Potion for purchase in the Market"