sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-20 04:38:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8563 from Alys/20170312-canceled-group-plan

Browse source 
use correct wording and date format for cancelled Group Plan in Payment Details screen
This commit is contained in:
Matteo Pagliazzi 2017-03-13 21:16:13 +01:00 committed by GitHub
commit 283403d6c8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,5 +265,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."
}

4
website/views/options/social/groups/group-subscription.jade
View file

@ -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')} <strong>{{moment(group.purchased.plan.dateTerminated).format('MM/DD/YYYY')}}</strong>
| #{env.t('groupPlanCanceled')} <strong>{{group.purchased.plan.dateTerminated | date:user.preferences.dateFormat}}</strong>
tr(ng-if='!group.purchased.plan.dateTerminated'): td
h3=env.t('paymentDetails')
p(ng-if='group.purchased.plan.planId')=env.t('groupSubscriptionPrice')