diff --git a/website/client/src/pages/settings/settingRows/fixValuesSetting.vue b/website/client/src/pages/settings/settingRows/fixValuesSetting.vue index f3dbe59edc..15965ef6c8 100644 --- a/website/client/src/pages/settings/settingRows/fixValuesSetting.vue +++ b/website/client/src/pages/settings/settingRows/fixValuesSetting.vue @@ -228,6 +228,7 @@ export default { }, save () { if (!this.validateInputs()) { + console.info('invalid1!!'); return; } @@ -264,10 +265,10 @@ export default { let valid = true; for (const stat of canRestore) { - if (this.restoreValues.stats[stat] === '' - || this.restoreValues.stats[stat] < 0 + if (this.restoreValues[stat] === '' + || this.restoreValues[stat] < 0 ) { - this.restoreValues.stats[stat] = this.user.stats[stat]; + this.restoreValues[stat] = this.user.stats[stat]; valid = false; } } diff --git a/website/client/src/pages/settings/settingRows/languageSetting.vue b/website/client/src/pages/settings/settingRows/languageSetting.vue index 526e157741..76bb97ee90 100644 --- a/website/client/src/pages/settings/settingRows/languageSetting.vue +++ b/website/client/src/pages/settings/settingRows/languageSetting.vue @@ -33,7 +33,7 @@ v-once class="dialog-disclaimer" > - {{ $t("americanEnglishGovern") }} + {{ $t("americanEnglishGovern") }}
diff --git a/website/client/src/pages/settings/settingRows/resetAccount.vue b/website/client/src/pages/settings/settingRows/resetAccount.vue index 4daaa00c23..06fe54286b 100644 --- a/website/client/src/pages/settings/settingRows/resetAccount.vue +++ b/website/client/src/pages/settings/settingRows/resetAccount.vue @@ -54,12 +54,16 @@
  • {{ $t('resetDetail4') }}
  • + +
  • + {{ $t('resetDetail5') }} +
  • diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json index b34d228348..542962e2ba 100644 --- a/website/common/locales/en/settings.json +++ b/website/common/locales/en/settings.json @@ -77,8 +77,8 @@ "resetDetail1": "You will lose all Gold, Experience, earned levels, and stat points.", "resetDetail2": "You will keep your current class, Pets and Mounts.", "resetDetail3": "All Tasks and their historical data (except those from Challenges) will be permanently deleted.", - "resetDetail4": "You will be able to buy back Equipment, including all limited edition or subscriber Mystery items that you already own.", - "resetDetail5": "Another option is using an Orb of Rebirth, which will reset everything else while preserving your Tasks and Equipment.", + "resetDetail4": "You will lose all your equipment except Subscriber Mystery Items and free commemorative items.", "resetDetail5": "You will be able to buy the deleted items back, including all limited edition equipment (you will need to be in the correct class to re-buy class-specific gear).", + "resetDetail6": "Another option is using an Orb of Rebirth, which will reset everything else while preserving your Tasks and Equipment.", "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 except Subscriber Mystery Items and free commemorative items. You will be able to buy the deleted items back, including all limited edition equipment (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class, achievements 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 and equipment.", "deleteLocalAccountText": "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 your password into the text box below.", "deleteSocialAccountText": "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 \"<%= magicWord %>\" into the text box below.",