mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-07-13 17:52:22 +00:00
Various fixes for new client (WIP) (#8953)
* sort equipment by stats: highest first * spelling fix: excercise > exercise * change wording for login link on register screen * remove incorrect Items heading from Quests Shop * fix missing "Recovery + Support Groups" guild category text and remove whitespace from keys * fix text for guildInformationPlaceHolder
This commit is contained in:
Alys
negue
parent
2770650340
commit
716695e11e
7 changed files with 17 additions and 18 deletions
|
|
@ -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') }}
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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: {
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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 <a href='/static/terms'>Terms of Service</a> and <a href='/static/privacy'>Privacy Policy</a>.",
|
||||
"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: <br/> <a href=\"http://habitica.wikia.com/wiki/Food_Preferences\" target=\"_blank\">http://habitica.wikia.com/wiki/Food_Preferences</a>",
|
||||
|
|
|
|||
Loading…
Reference in a new issue