krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #10511 (#10551)

Browse Source
This commit is contained in:
Matteo Pagliazzi
2018-07-23 19:47:32 +02:00
committed by GitHub
parent 7bead74b49
commit d2a39a5124
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/client/components/payments/amazonModal.vue
View File

@@ -3,8 +3,10 @@
h2.text-center Continue with Amazon h2.text-center Continue with Amazon
#AmazonPayButton #AmazonPayButton
#AmazonPayWallet(v-if="amazonPayments.loggedIn", style="width: 400px; height: 228px;") #AmazonPayWallet(v-if="amazonPayments.loggedIn", style="width: 400px; height: 228px;")
#AmazonPayRecurring(v-if="amazonPayments.loggedIn && amazonPayments.type === 'subscription'", template(v-if="amazonPayments.loggedIn && amazonPayments.type === 'subscription'")
style="width: 400px; height: 140px;") br
p(v-html="$t('amazonPaymentsRecurring')")
#AmazonPayRecurring(style="width: 400px; height: 140px;")
.modal-footer .modal-footer
.text-center .text-center
button.btn.btn-primary(v-if="amazonPaymentsCanCheckout", button.btn.btn-primary(v-if="amazonPaymentsCanCheckout",

1
website/common/locales/en/settings.json
View File

@@ -184,6 +184,7 @@
"mysticHourglassesTooltip": "Mystic Hourglasses", "mysticHourglassesTooltip": "Mystic Hourglasses",
"paypal": "PayPal", "paypal": "PayPal",
"amazonPayments": "Amazon Payments", "amazonPayments": "Amazon Payments",
"amazonPaymentsRecurring": "Ticking the checkbox below is necessary for your subscription to be created. It allows your Amazon account to be used for ongoing payments for <strong>this</strong> subscription. It will not cause your Amazon account to be automatically used for any future purchases.",
"timezone": "Time Zone", "timezone": "Time Zone",
"timezoneUTC": "Habitica uses the time zone set on your PC, which is: <strong><%= utc %></strong>", "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <strong><%= utc %></strong>",
"timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.<br><br> <strong>If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all.</strong> If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices.", "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.<br><br> <strong>If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all.</strong> If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices.",