sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-04 04:59:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-german-translations' into fix-challenge-layout

Browse source
This commit is contained in:
Marvin Rabe 2018-05-01 20:17:29 +02:00
commit 9d755c5d5f
6 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
website/client/components/challenges/sidebar.vue
View file

@ -5,7 +5,7 @@
form
h2(v-once) {{ $t('filter') }}
.form-group
h3 Category
h3 {{ $t('category') }}
.form-check(
v-for="group in categoryOptions",
:key="group.key",
@ -14,7 +14,7 @@
input.custom-control-input(type="checkbox", :value='group.key' v-model="categoryFilters", :id="group.key")
label.custom-control-label(v-once, :for="group.key") {{ $t(group.label) }}
.form-group(v-if='$route.name !== "findChallenges"')
h3 Membership
h3 {{ $t('membership') }}
.form-check(
v-for="group in roleOptions",
:key="group.key",
@ -23,7 +23,7 @@
input.custom-control-input(type="checkbox", :value='group.key' v-model="roleFilters", :id="group.key")
label.custom-control-label(v-once, :for="group.key") {{ $t(group.label) }}
.form-group
h3 Ownership
h3 {{ $t('ownership') }}
.form-check(
v-for="group in ownershipOptions",
:key="group.key",

6
website/client/components/groups/sidebar.vue
View file

@ -6,7 +6,7 @@
form
h2(v-once) {{ $t('filter') }}
.form-group
h3 Category
h3 {{ $t('category') }}
.form-check(
v-for="group in categoryOptions",
:key="group.key",
@ -15,7 +15,7 @@
input.custom-control-input(type="checkbox", :value='group.key' v-model="categoryFilters", :id="group.key")
label.custom-control-label(v-once, :for="group.key") {{ $t(group.label) }}
.form-group
h3 Role
h3 {{ $t('role') }}
.form-check(
v-for="group in roleOptions",
:key="group.key",
@ -24,7 +24,7 @@
input.custom-control-input(type="checkbox", :value='group.key' v-model="roleFilters", :id="group.key")
label.custom-control-label(v-once, :for="group.key") {{ $t(group.label) }}
.form-group
h3 Guild Size
h3 {{ $t('guildSize') }}
.form-check(
v-for="group in guildSizeOptions",
:key="group.key",

2
website/client/components/inventory/stable/index.vue
View file

@ -47,7 +47,7 @@
label.custom-control-label(v-once, :for="mountGroup.key") {{ mountGroup.label }}
div.form-group.clearfix
h3.float-left Hide Missing
h3.float-left {{ $t('hideMissing') }}
toggle-switch.float-right(
:checked="hideMissing",
@change="updateHideMissing"

2
website/common/locales/en/challenge.json
View file

@ -26,7 +26,9 @@
"filter": "Filter",
"groups": "Groups",
"noNone": "None",
"category": "Category",
"membership": "Membership",
"ownership": "Ownership",
"participating": "Participating",
"notParticipating": "Not Participating",
"either": "Either",

2
website/common/locales/en/groups.json
View file

@ -371,9 +371,11 @@
"recentActivity": "Recent Activity",
"myGuilds": "My Guilds",
"guildsDiscovery": "Discover Guilds",
"role": "Role",
"guildOrPartyLeader": "Leader",
"guildLeader": "Guild Leader",
"member": "Member",
"guildSize": "Guild Size",
"goldTier": "Gold Tier",
"silverTier": "Silver Tier",
"bronzeTier": "Bronze Tier",

1
website/common/locales/en/npc.json
View file

@ -53,6 +53,7 @@
"featuredItems": "Featured Items!",
"hideLocked": "Hide locked",
"hidePinned": "Hide pinned",
"hideMissing": "Hide Missing",
"amountExperience": "<%= amount %> Experience",
"amountGold": "<%= amount %> Gold",
"namedHatchingPotion": "<%= type %> Hatching Potion",