Update remaining Notification labels

website/client/src/components/settings/index.vue

@@ -38,7 +38,6 @@
         {{ $t('subscription') }}
       </router-link>
       <router-link
-        v-if="hasPermission(user, 'userSupport')"
         class="nav-link"
         :to="{name: 'transactions'}"
         :class="{'active': $route.name === 'transactions'}"
@@ -82,7 +81,7 @@
       </div>
     </div>
     <div class="col-12 d-flex justify-content-center">
-      <div :class="{'settings-content': $route.name !== 'subscription'}">
+      <div :class="{'settings-content': applyNarrowView}">
         <router-view />
       </div>
     </div>
@@ -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 () {

website/client/src/components/settings/notifications.vue

@@ -106,18 +106,18 @@
         <tr>
           <td></td>
           <th class="email_push_col email_col_padding">
-            <span>{{ $t('email') }}</span>
+            <span v-once>{{ $t('email') }}</span>
           </th>
           <th class="email_push_col">
-            <span>{{ $t('push') }}</span>
+            <span v-once>{{ $t('push') }}</span>
           </th>
         </tr>
         <tr
             v-for="notification in notificationsIds"
             :key="notification"
         >
-          <td>
-            <span>{{ $t(notification) }}</span>
+          <td class="bold" v-once>
+            {{ $t(notification) }}
           </td>
           <td class="email_push_col">
              <toggle-switch :checked="user.preferences.emailNotifications[notification]"
@@ -133,6 +133,11 @@
             />
           </td>
         </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
       </table>
     </div>
   </div>
@@ -217,8 +222,8 @@ export default {
         'invitedParty',
         'invitedGuild',
         'invitedQuest',
-        'wonChallenge',
         'questStarted',
+        'wonChallenge',
         // 'weeklyRecaps',
         'kickedGroup',
         'onboarding',

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",