adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321)

common/locales/en/api-v3.json

@@ -168,12 +168,9 @@
   "cannotRevive": "Cannot revive if not dead",
   "rebirthComplete": "You have been reborn!",
   "petNotOwned": "You do not own this pet.",
-  "rerollComplete": "Reroll complete!",
-  "resetComplete": "Reset has completed",
   "regIdRequired": "RegId is required",
   "pushDeviceAdded": "Push device added successfully",
   "pushDeviceAlreadyAdded": "The user already has the push device",
-  "resetComplete": "Reset completed",
   "lvl10ChangeClass": "To change class you must be at least level 10.",
   "equipmentAlreadyOwned": "You already own that piece of equipment",
   "pmsMarkedRead": "Your private messages have been marked as read",

common/locales/en/rebirth.json

@@ -5,7 +5,7 @@
     "rebirthStartOver": "Rebirth starts your character over from Level 1.",
     "rebirthAdvList1": "You return to full Health.",
     "rebirthAdvList2": "You have no Experience, Gold, or Equipment (with the exception of free items like Mystery items).",
-    "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset.",
+    "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.",
     "rebirthAdvList4": "You have the starting class of Warrior until you earn a new class.",
     "rebirthInherit": "Your new character inherits a few things from their predecessor:",
     "rebirthInList1": "Tasks, history, and settings remain.",

common/locales/en/settings.json

@@ -61,7 +61,7 @@
     "newUsername": "New Login Name",
     "dangerZone": "Danger Zone",
     "resetText1": "WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.",
-    "resetText2": "You will lose all your levels, gold, and experience points. All your tasks will be deleted permanently and you will lose all of your task's historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.",
+    "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.",
     "deleteText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type <strong><%= deleteWord %></strong> into the text box below.",
     "API": "API",
     "APIText": "Copy these for use in third party applications. However, think of your API Token like a password, and do not share it publicly. You may occasionally be asked for your User ID, but never post your API Token where others can see it, including on Github.",
@@ -75,6 +75,7 @@
     "otherExtensions": "<a target='blank' href='http://habitica.wikia.com/wiki/App_and_Extension_Integrations'>Other Extensions</a>",
     "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.",
     "resetDo": "Do it, reset my account!",
+    "resetComplete": "Reset complete!",
     "fixValues": "Fix Values",
     "fixValuesText1": "If you've encountered a bug or made a mistake that unfairly changed your character (damage you shouldn't have taken, Gold you didn't really earn, etc.), you can manually correct your numbers here. Yes, this makes it possible to cheat: use this feature wisely, or you'll sabotage your own habit-building!",
     "fixValuesText2": "Note that you cannot restore Streaks on individual tasks here. To do that, edit the Daily and go to Advanced Options, where you will find a Restore Streak field.",

common/locales/en/tasks.json

@@ -88,8 +88,9 @@
     "fortifyName": "Fortify Potion",
     "fortifyPop": "Return all tasks to neutral value (yellow color), and restore all lost Health.",
     "fortify": "Fortify",
-    "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!",
+    "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!",
     "confirmFortify": "Are you sure?",
+    "fortifyComplete": "Fortify complete!",
     "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?",
     "streakCoins": "Streak Bonus!",
     "pushTaskToTop": "Push task to top.  Hold ctrl or cmd to push to bottom.",

common/script/ops/reroll.js

@@ -34,7 +34,7 @@ module.exports = function reroll (user, tasks = [], req = {}, analytics) {
   } else {
     return [
       {user, tasks},
-      i18n.t('rerollComplete'),
+      i18n.t('fortifyComplete'),
     ];
   }
 };

test/api/v3/integration/user/POST-user_reroll.test.js

@@ -47,7 +47,7 @@ describe('POST /user/reroll', () => {
     let updatedDaily = await user.get(`/tasks/${daily._id}`);
     let updatedReward = await user.get(`/tasks/${reward._id}`);
 
-    expect(response.message).to.equal(t('rerollComplete'));
+    expect(response.message).to.equal(t('fortifyComplete'));
     expect(updatedDaily.value).to.equal(0);
     expect(updatedReward.value).to.equal(1);
   });

test/common/ops/reroll.js

@@ -34,7 +34,7 @@ describe('shared.ops.reroll', () => {
   it('rerolls a user with enough gems', () => {
     let [, message] = reroll(user);
 
-    expect(message).to.equal(i18n.t('rerollComplete'));
+    expect(message).to.equal(i18n.t('fortifyComplete'));
   });
 
   it('reduces a user\'s balance', () => {