diff --git a/website/client/components/auth/registerLogin.vue b/website/client/components/auth/registerLogin.vue
index c102ad19b6..d0e4dd377f 100644
--- a/website/client/components/auth/registerLogin.vue
+++ b/website/client/components/auth/registerLogin.vue
@@ -33,7 +33,7 @@
small.form-text(v-once, v-html="$t('termsAndAgreement')")
.text-center
.btn.btn-info(@click='register()', v-if='registering', v-once) {{$t('joinHabitica')}}
- .btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('login')}}
+ .btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('alreadyHaveAccountLogin')}}
.toggle-links
router-link(:to="{name: 'login'}", v-if='registering', exact)
a.toggle-link(v-once) {{ $t('login') }}
diff --git a/website/client/components/creatorIntro.vue b/website/client/components/creatorIntro.vue
index eeaee68838..3927e182aa 100644
--- a/website/client/components/creatorIntro.vue
+++ b/website/client/components/creatorIntro.vue
@@ -184,7 +184,7 @@ b-modal#avatar-modal(title="", size='md', :hide-header='true', :hide-footer='tru
label.custom-control.custom-checkbox
input.custom-control-input(type="checkbox")
span.custom-control-indicator
- span.custom-control-description(v-once) {{ $t('excercise') }}
+ span.custom-control-description(v-once) {{ $t('exercise') }}
div
label.custom-control.custom-checkbox
input.custom-control-input(type="checkbox")
diff --git a/website/client/components/groups/groupFormModal.vue b/website/client/components/groups/groupFormModal.vue
index 19ecff52c6..f39d62a5a7 100644
--- a/website/client/components/groups/groupFormModal.vue
+++ b/website/client/components/groups/groupFormModal.vue
@@ -228,19 +228,19 @@ export default {
},
{
label: 'mental_health',
- key: 'mental_health ',
+ key: 'mental_health',
},
{
label: 'organization',
- key: 'organization ',
+ key: 'organization',
},
{
- label: 'Recovery + Support Groups',
- key: 'recovery_support_groups ',
+ label: 'recovery_support_groups',
+ key: 'recovery_support_groups',
},
{
label: 'spirituality',
- key: 'spirituality ',
+ key: 'spirituality',
},
{
label: 'time_management',
diff --git a/website/client/components/groups/sidebar.vue b/website/client/components/groups/sidebar.vue
index 1352c781c3..8975989b76 100644
--- a/website/client/components/groups/sidebar.vue
+++ b/website/client/components/groups/sidebar.vue
@@ -83,19 +83,19 @@ export default {
},
{
label: 'mental_health',
- key: 'mental_health ',
+ key: 'mental_health',
},
{
label: 'organization',
- key: 'organization ',
+ key: 'organization',
},
{
- label: 'Recovery + Support Groups',
- key: 'recovery_support_groups ',
+ label: 'recovery_support_groups',
+ key: 'recovery_support_groups',
},
{
label: 'spirituality',
- key: 'spirituality ',
+ key: 'spirituality',
},
{
label: 'time_management',
diff --git a/website/client/components/inventory/equipment/index.vue b/website/client/components/inventory/equipment/index.vue
index 48c2d1990b..a5b0aa12ee 100644
--- a/website/client/components/inventory/equipment/index.vue
+++ b/website/client/components/inventory/equipment/index.vue
@@ -133,6 +133,7 @@ import each from 'lodash/each';
import map from 'lodash/map';
import throttle from 'lodash/throttle';
import _sortBy from 'lodash/sortBy';
+import _reverse from 'lodash/reverse';
import bDropdown from 'bootstrap-vue/lib/components/dropdown';
import bDropdownItem from 'bootstrap-vue/lib/components/dropdown-item';
@@ -229,7 +230,7 @@ export default {
});
},
sortItems (items, sortBy) {
- return _sortBy(items, sortGearTypeMap[sortBy]);
+ return _reverse(_sortBy(items, sortGearTypeMap[sortBy]));
},
},
computed: {
diff --git a/website/client/components/shops/quests/index.vue b/website/client/components/shops/quests/index.vue
index 6c872339e3..205d8a7fb8 100644
--- a/website/client/components/shops/quests/index.vue
+++ b/website/client/components/shops/quests/index.vue
@@ -62,9 +62,6 @@
h1.mb-0.page-header(v-once) {{ $t('quests') }}
.clearfix
- h2.float-left
- | {{ $t('items') }}
-
div.float-right
span.dropdown-label {{ $t('sortBy') }}
b-dropdown(:text="$t(selectedSortItemsBy)", right=true)
diff --git a/website/common/locales/en/newClient.json b/website/common/locales/en/newClient.json
index 1187a4b89a..313f7471d4 100644
--- a/website/common/locales/en/newClient.json
+++ b/website/common/locales/en/newClient.json
@@ -113,7 +113,7 @@
"inviteToPartyOrQuest": "Invite Party to Quest",
"inviteInformation": "Clicking “Invite” will send an invitation to your party members. When all members have accepted or denied, the Quest begins.",
"questOwnerRewards": "Quest Owner Rewards",
- "guildInformationPlaceHolder": "This is our party’s description. It describes what we do in this party. If you want to learn more about what we do in this party, read the description. Party on.",
+ "guildInformationPlaceHolder": "Use this section to go into more detail about everything that Guild members should know about your Guild. Useful tips, helpful links, and encouraging statements all go here!",
"updateParty": "Update Party",
"upgrade": "Upgrade",
"signUpWithSocial": "Sign up with <%= social %>",
@@ -125,12 +125,13 @@
"confirmPasswordPlaceholder": "Make sure it’s the same password!",
"termsAndAgreement": "By clicking the button below, you are indicating that you have read and agree to the Terms of Service and Privacy Policy.",
"joinHabitica": "Join Habitica",
+ "alreadyHaveAccountLogin": "Already have a Habitica account? Log in",
"quickInventory": "Quick Inventory",
"noFoodAvailable": "You don't have any food.",
"gotIt": "Got it!",
"welcomeStable": "Welcome to the Stable!",
"welcomeStableText": "I'm Matt, the Beast Master. Starting at level 3, you can hatch Pets from Eggs by using Potions you find! When you hatch a Pet from your Inventory, it will appear here! Click a Pet's image to add it to your avatar. Feed them here with the Food you find after level 3, and they'll grow into hardy Mounts.",
- "excercise": "Excercise",
+ "exercise": "Exercise",
"creativity": "Creativity",
"budgeting": "Budgeting",
"petLikeToEatText": "Pets will grow no matter what you feed them, but they'll grow faster if you feed them the one food that they like best. Experiment to find out the pattern, or see the answers here:
http://habitica.wikia.com/wiki/Food_Preferences",