diff --git a/website/client/components/settings/subscription.vue b/website/client/components/settings/subscription.vue index 787028630e..b0723561cd 100644 --- a/website/client/components/settings/subscription.vue +++ b/website/client/components/settings/subscription.vue @@ -69,7 +69,7 @@ div(v-if='hasSubscription') .btn.btn-primary(v-if='canEditCardDetails', @click='showStripeEdit()') {{ $t('subUpdateCard') }} .btn.btn-sm.btn-danger(v-if='canCancelSubscription && !loading', @click='cancelSubscription()') {{ $t('cancelSub') }} - small(v-if='!canCancelSubscription', v-html='getCancelSubInfo()') + small(v-if='!canCancelSubscription && !hasCanceledSubscription', v-html='getCancelSubInfo()') .subscribe-pay(v-if='!hasSubscription || hasCanceledSubscription') h3 {{ $t('subscribeUsing') }} @@ -260,8 +260,9 @@ export default { subs.google_6mo.discount = false; }, getCancelSubInfo () { - // @TODO: String 'cancelSubInfoGroup Plan' not found. ? - return this.$t(`cancelSubInfo${this.user.purchased.plan.paymentMethod}`); + let payMethod = this.user.purchased.plan.paymentMethod || ''; + if (payMethod === 'Group Plan') payMethod = 'GroupPlan'; + return this.$t(`cancelSubInfo${payMethod}`); }, }, }; diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index 7e7986897c..128191516f 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -319,7 +319,7 @@ "aboutToJoinCancelledGroupPlan": "You are about to join a group with a canceled plan. You will NOT receive a free subscription.", "cannotChangeLeaderWithActiveGroupPlan": "You can not change the leader while the group has an active plan.", "leaderCannotLeaveGroupWithActiveGroup": "A leader can not leave a group while the group has an active plan", - "youHaveGroupPlan": "You have a free subscription because you are a member of a group that has a Group Plan. This will end when you are no longer in the group that has a group plan. Any months of extra subscription credit you have will be applied at the end of the group plan.", + "youHaveGroupPlan": "You have a free subscription because you are a member of a group that has a Group Plan. This will end when you are no longer in the group that has a Group Plan. Any months of extra subscription credit you have will be applied at the end of the Group Plan.", "cancelGroupSub": "Cancel Group Plan", "confirmCancelGroupPlan": "Are you sure you want to cancel the group plan and remove its benefits from all members, including their free subscriptions?", "canceledGroupPlan": "Canceled Group Plan", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index d6802bbdb0..12d19a98ab 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -40,6 +40,7 @@ "cancelSub": "Cancel Subscription", "cancelSubInfoGoogle": "Please go to the \"Account\" > \"Subscriptions\" section of the Google Play Store app to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.", "cancelSubInfoApple": "Please follow Apple's official instructions to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.", + "cancelSubInfoGroupPlan": "Because you have a free subscription from a Group Plan, you cannot cancel it. It will end when you are no longer in the Group. If you are the Group leader and want to cancel the entire Group Plan, you can do that from the group's \"Payment Details\" tab.", "canceledSubscription": "Canceled Subscription", "cancelingSubscription": "Canceling the subscription", "adminSub": "Administrator Subscriptions",