diff --git a/website/client/src/components/settings/index.vue b/website/client/src/components/settings/index.vue index 3a20f84898..b37be458e0 100644 --- a/website/client/src/components/settings/index.vue +++ b/website/client/src/components/settings/index.vue @@ -38,7 +38,6 @@ {{ $t('subscription') }}
-
+
@@ -155,6 +154,9 @@ export default { if (!this.currentEvent || !this.currentEvent.promo) return 'none'; return this.currentEvent.promo; }, + applyNarrowView () { + return !['subscription', 'transactions'].includes(this.$route.name); + }, }, methods: { showSelectUser () { diff --git a/website/client/src/components/settings/notifications.vue b/website/client/src/components/settings/notifications.vue index 0bf9ac6e1e..ff67f4a85d 100644 --- a/website/client/src/components/settings/notifications.vue +++ b/website/client/src/components/settings/notifications.vue @@ -106,18 +106,18 @@ - {{ $t('email') }} + {{ $t('email') }} - {{ $t('push') }} + {{ $t('push') }} - - {{ $t(notification) }} + + {{ $t(notification) }} + + + + +
@@ -217,8 +222,8 @@ export default { 'invitedParty', 'invitedGuild', 'invitedQuest', - 'wonChallenge', 'questStarted', + 'wonChallenge', // 'weeklyRecaps', 'kickedGroup', 'onboarding', diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json index 12bf2fafb8..a26f870a8c 100644 --- a/website/common/locales/en/settings.json +++ b/website/common/locales/en/settings.json @@ -108,8 +108,8 @@ "giftedSubscriptionInfo": "<%= name %> gifted you a <%= months %> month subscription", "giftedSubscriptionFull": "Hello <%= username %>, <%= sender %> has sent you <%= monthCount %> months of subscription!", "giftedSubscriptionWinterPromo": "Hello <%= username %>, you received <%= monthCount %> months of subscription as part of our holiday gift-giving promotion!", - "invitedParty": "You were invited to a Party", - "invitedGuild": "You were invited to a Guild", + "invitedParty": "Invited to a Party", + "invitedGuild": "Invited to a Guild", "importantAnnouncements": "Reminders to check in to complete tasks and receive prizes", "weeklyRecaps": "Summaries of your account activity in the past week (Note: this is currently disabled due to performance issues, but we hope to have this back up and sending e-mails again soon!)", "onboarding": "Guidance with setting up your Habitica account",