sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-22 05:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks

Browse source 
Text and visual tweaks for Gems
This commit is contained in:
Sabe Jones 2016-01-18 15:25:58 -06:00
commit c6b4b24052
4 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/locales/en/subscriber.json
View file

@ -1,14 +1,14 @@
{
"subscription": "Subscription",
"subscriptions": "Subscriptions",
"subDescription": "Buy gems with gold, get monthly mystery items, retain progress history, double daily drop-caps, support the devs. Click for more info.",
"subDescription": "Buy Gems with gold, get monthly mystery items, retain progress history, double daily drop-caps, support the devs. Click for more info.",
"buyGemsGold": "Buy Gems with Gold",
"buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
"buyGemsGoldText": "Alexander the Merchant will sell you Gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> Gems per month, but this cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!",
"retainHistory": "Retain full history entries",
"retainHistoryText": "Makes your full history available in graphs and export. Non-subscriber histories get consolidated for database optimization.",
"doubleDrops": "Daily drop-caps doubled",
"doubleDropsText": "Complete your stable faster!",
"mysteryItem": "Exclusive Monthly Items",
"mysteryItem": "Exclusive monthly items",
"mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
"supportDevs": "Supports the developers",
"supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
@ -47,9 +47,9 @@
"timeSupportText": "We will provide support for training, bugs, installation, and feature requests.",
"gameFeatures": "Game features",
"gold2Gem": "Gems purchasable with gold",
"gold2GemText": "Members will be able to purchase gems with gold, meaning none of your participants need to buy anything with real money.",
"infiniteGem": "Infinite leader gems",
"infiniteGemText": "We will provide the organization leaders with as many gems as they need, for things like challenge prizes, guild-creation, etc.",
"gold2GemText": "Members will be able to purchase Gems with gold, meaning none of your participants need to buy anything with real money.",
"infiniteGem": "Infinite leader Gems",
"infiniteGemText": "We will provide the organization leaders with as many Gems as they need, for things like challenge prizes, guild-creation, etc.",
"notYetPlan": "Plan not yet available, but click to contact us and we'll keep you updated.",
"contactUs": "Contact Us",
"checkout": "Checkout",
@ -60,11 +60,12 @@
"subGemPop": "Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold. You can see how many Gems are available to buy at the corner of the Gem icon.",
"subGemName": "Subscriber Gems",
"freeGemsTitle": "Obtain Gems for Free",
"maxBuyGems": "You have bought all the gems you can this month. Thanks for subscribing!",
"maxBuyGems": "You have bought all the Gems you can this month. More will become available within the first three days of next month. Thanks for subscribing!",
"buyGemsAllow1": "You can buy",
"buyGemsAllow2": "more gems this month",
"buyGemsAllow2": "more Gems this month",
"purchaseGemsSeparately": "Purchase Additional Gems",
"subFreeGemsHow": "Habitica players can earn gems for free by winning <a href=\"/#/options/groups/challenges\">challenges</a> that award gems as a prize, or as a <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">contributor reward by helping the development of Habitica.</a>",
"subFreeGemsHow": "Habitica players can earn Gems for free by winning <a href=\"/#/options/groups/challenges\">challenges</a> that award Gems as a prize, or as a <a href=\"http://habitica.wikia.com/wiki/Contributing_to_Habitica\">contributor reward by helping the development of Habitica.</a>",
"seeSubscriptionDetails": "Go to <a href='/#/options/settings/subscription'>Settings &gt; Subscription</a> to see your subscription details!",
"timeTravelers": "Time Travelers",
"timeTravelersTitleNoSub": "<%= linkStartTyler %>Tyler<%= linkEnd %> and <%= linkStartVicky %>Vicky<%= linkEnd %>",
"timeTravelersTitle": "Mysterious Time Travelers",

3
website/public/css/shared.styl
View file

@ -107,3 +107,6 @@ li.spaced
.row-margin
margin: auto auto 1em auto
.reduce-top-margin
margin-top: -10px

29
website/views/options/settings.jade
View file

@ -328,9 +328,9 @@ script(id='partials/options.settings.notifications.html', type="text/ng-template
script(id='partials/options.settings.subscription.html',type='text/ng-template')
//-h2=env.t('individualSub')
.container-fluid(ng-init='_subscription={key:"basic_earned"}')
h3= env.t('benefits')
.row
.col-md-6
h3= env.t('benefits')
+subPerks()
.col-md-6
@ -354,7 +354,7 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template')
li #{env.t('mysticHourglasses')} {{user.purchased.plan.consecutive.trinkets}}
div(ng-if='!user.purchased.plan.customerId || (user.purchased.plan.customerId && user.purchased.plan.dateTerminated)')
h4(ng-if='(user.purchased.plan.customerId && user.purchased.plan.dateTerminated)')= env.t("resubscribe")
.form-group
.form-group.reduce-top-margin
.radio(ng-repeat='block in Content.subscriptionBlocks | toArray | omit: "discount==true" | orderBy:"months"')
label
input(type="radio", name="subRadio", ng-value="block.key", ng-model='_subscription.key')
@ -370,19 +370,20 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template')
input.form-control(type='text', ng-model='_subscription.coupon', placeholder= env.t('couponPlaceholder'))
.form-group
button.pull-right.btn.btn-small(type='button',ng-click='applyCoupon(_subscription.coupon)')= env.t("apply")
p.resubscribe
small.muted=env.t('subscribeUsing')
a.purchase.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card')
.container-fluid.slight-vertical-padding
.row.text-center
.col-xs-6
a.purchase(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key')
img(src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png',alt=env.t('paypal'))
.col-xs-6
a.purchase(ng-click="Payments.amazonPayments.init({type: 'subscription', subscription:_subscription.key, coupon:_subscription.coupon})")
img(src='https://payments.amazon.com/gp/cba/button',alt=env.t('amazonPayments'))
div(ng-if='user.purchased.plan.customerId')
.btn.btn-primary(ng-if='!user.purchased.plan.dateTerminated && user.purchased.plan.paymentMethod=="Stripe"', ng-click='Payments.showStripeEdit()')=env.t('subUpdateCard')
.btn.btn-sm.btn-danger(ng-if='!user.purchased.plan.dateTerminated', ng-click='Payments.cancelSubscription()')=env.t('cancelSub')
.container-fluid.slight-vertical-padding(ng-if='!user.purchased.plan.customerId || (user.purchased.plan.customerId && user.purchased.plan.dateTerminated)')
small.muted=env.t('subscribeUsing')
.row.text-center
.col-xs-4
a.purchase.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card')
.col-xs-4
a.purchase(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key')
img(src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png',alt=env.t('paypal'))
.col-xs-4
a.purchase(ng-click="Payments.amazonPayments.init({type: 'subscription', subscription:_subscription.key, coupon:_subscription.coupon})")
img(src='https://payments.amazon.com/gp/cba/button',alt=env.t('amazonPayments'))

8
website/views/shared/modals/buy-gems.jade
View file

@ -47,6 +47,7 @@ script(id='modals/buyGems.html', type='text/ng-template')
p=env.t('buyGemsAllow1')
| &nbsp;{{Shared.planGemLimits.convCap + User.user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}}&nbsp;
=env.t('buyGemsAllow2')
p!=env.t('seeSubscriptionDetails')
div(ng-if='user.purchased.plan.customerId')
.well
h3=env.t('purchaseGemsSeparately')
@ -70,6 +71,7 @@ script(id='modals/buyGems.html', type='text/ng-template')
h3=env.t('becomeSubscriber')
div(ng-include="'partials/options.settings.subscription.html'")
.modal-footer
button.btn.btn-default(ng-click='$close()')=env.t('cancel')
div(ng-if='user.purchased.plan.customerId').pull-left
p!=env.t('seeSubscriptionDetails')
.text-right
button.btn.btn-default(ng-click='$close()')=env.t('close')