From 09490551d42201e18e59333f243085dcd632555c Mon Sep 17 00:00:00 2001 From: Alys Date: Sun, 12 Mar 2017 18:42:34 +1000 Subject: [PATCH] correct wording and date format for cancelled Group Plan in Payment Details screen --- website/common/locales/en/groups.json | 2 ++ website/views/options/social/groups/group-subscription.jade | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index bfb10cf844..78ec098d65 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -262,5 +262,7 @@ "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", + "groupPlanCanceled": "Group Plan will become inactive on", "purchasedGroupPlanPlanExtraMonths": "You have <%= months %> months of extra group plan credit." } diff --git a/website/views/options/social/groups/group-subscription.jade b/website/views/options/social/groups/group-subscription.jade index e93431e502..7eecc28cda 100644 --- a/website/views/options/social/groups/group-subscription.jade +++ b/website/views/options/social/groups/group-subscription.jade @@ -11,9 +11,9 @@ mixin groupSubscription() br table.table.alert.alert-info(ng-if='group.purchased.plan.customerId') tr(ng-if='group.purchased.plan.dateTerminated'): td.alert.alert-warning - span.noninteractive-button.btn-danger=env.t('canceledSubscription') + span.noninteractive-button.btn-danger=env.t('canceledGroupPlan') i.glyphicon.glyphicon-time - | #{env.t('subCanceled')} {{moment(group.purchased.plan.dateTerminated).format('MM/DD/YYYY')}} + | #{env.t('groupPlanCanceled')} {{group.purchased.plan.dateTerminated | date:user.preferences.dateFormat}} tr(ng-if='!group.purchased.plan.dateTerminated'): td h3=env.t('paymentDetails') p(ng-if='group.purchased.plan.planId')=env.t('groupSubscriptionPrice')