Skip to content

Commit f75d8e6

Browse files
tobihagemanntobihagemann
committed
Merge branch 'develop'
2 parents 10e6ffc + 879812f commit f75d8e6

File tree

8 files changed

+38
-4
lines changed

8 files changed

+38
-4
lines changed

‎assets/js/androidkey.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ class AndroidLicense {
6565
return;
6666
}
6767

68+
if (this._checkoutData.email !== this._checkoutData.emailConfirm) {
69+
this._checkoutData.errorMessage = 'Email addresses do not match.';
70+
return;
71+
}
72+
6873
this._checkoutData.inProgress = true;
6974
this._checkoutData.errorMessage = '';
7075
this._checkoutData.success = false;

‎assets/js/desktopkey.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ class DesktopLicense {
6868
return;
6969
}
7070

71+
if (this._checkoutData.email !== this._checkoutData.emailConfirm) {
72+
this._checkoutData.errorMessage = 'Email addresses do not match.';
73+
return;
74+
}
75+
7176
this._checkoutData.inProgress = true;
7277
this._checkoutData.errorMessage = '';
7378
this._checkoutData.success = false;

‎i18n/de.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
translation: "E-Mail"
6161
- id: android_getkey_email_placeholder
6262
translation: "E-Mail-Adresse"
63+
- id: android_getkey_email_confirm
64+
translation: "E-Mail bestätigen"
65+
- id: android_getkey_email_confirm_placeholder
66+
translation: "E-Mail-Adresse bestätigen"
6367
- id: android_getkey_instruction
6468
translation: "Zahlungen werden über Paddle abgewickelt."
6569
- id: android_getkey_checkout
@@ -990,6 +994,10 @@
990994
translation: "E-Mail"
991995
- id: supporter_cert_common_email_placeholder
992996
translation: "E-Mail-Adresse"
997+
- id: supporter_cert_common_email_confirm
998+
translation: "E-Mail bestätigen"
999+
- id: supporter_cert_common_email_confirm_placeholder
1000+
translation: "E-Mail-Adresse bestätigen"
9931001
- id: supporter_cert_common_submit
9941002
translation: "Anfrage senden"
9951003
- id: supporter_cert_common_success_title

‎i18n/en.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
translation: "Email"
6161
- id: android_getkey_email_placeholder
6262
translation: "Email address"
63+
- id: android_getkey_email_confirm
64+
translation: "Confirm Email"
65+
- id: android_getkey_email_confirm_placeholder
66+
translation: "Confirm email address"
6367
- id: android_getkey_instruction
6468
translation: "Payments are securely handled by Paddle."
6569
- id: android_getkey_checkout
@@ -990,6 +994,10 @@
990994
translation: "Email"
991995
- id: supporter_cert_common_email_placeholder
992996
translation: "Email address"
997+
- id: supporter_cert_common_email_confirm
998+
translation: "Confirm Email"
999+
- id: supporter_cert_common_email_confirm_placeholder
1000+
translation: "Confirm email address"
9931001
- id: supporter_cert_common_submit
9941002
translation: "Send Request"
9951003
- id: supporter_cert_common_success_title

‎layouts/donate/list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
1919
</div>
2020
</div>
2121

22-
<div x-data="{showTab: location.hash}" x-init="location.hash = showTab || '#paypal'" @hashchange.window="showTab = location.hash" class="flex flex-col space-y-4 w-full relative lg:h-412px">
22+
<div x-data="{showTab: location.hash}" x-init="location.hash = showTab || '#paypal'" @hashchange.window="showTab = location.hash" class="flex flex-col space-y-4 w-full relative lg:min-h-[402px]">
2323
{{ range .Pages }}
2424
<div class="space-y-2 lg:space-y-0">
2525
<div class="w-full lg:pr-3 lg:w-1/2">

‎layouts/partials/android-getkey.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div x-data="{checkoutData: {price: null, discountedPrice: null, email: '', errorMessage: '', success: false, inProgress: false, acceptNewsletter: false, captcha: null}, acceptTerms: false, androidLicense: null, captchaState: null}" x-init="androidLicense = new AndroidLicense($refs.form, checkoutData); androidLicense.loadPrice()" class="white-box">
1+
<div x-data="{checkoutData: {price: null, discountedPrice: null, email: '', emailConfirm: '', errorMessage: '', success: false, inProgress: false, acceptNewsletter: false, captcha: null}, acceptTerms: false, androidLicense: null, captchaState: null}" x-init="androidLicense = new AndroidLicense($refs.form, checkoutData); androidLicense.loadPrice()" class="white-box">
22
<div class="px-4 py-2 border-b border-primary text-center">
33
<h3 class="font-h3 text-lg">{{ i18n "android_getkey_title" }}</h3>
44
</div>
@@ -21,6 +21,10 @@ <h3 class="font-h3 text-lg">{{ i18n "android_getkey_title" }}</h3>
2121
<label class="label-uppercase mb-2">{{ i18n "android_getkey_email" }}</label>
2222
<input x-model="checkoutData.email" x-ref="email" @blur="$refs.email.classList.add('show-invalid')" type="email" class="input-box w-full" placeholder="{{ i18n "android_getkey_email_placeholder" }}" required/>
2323
</div>
24+
<div class="mb-4">
25+
<label class="label-uppercase mb-2">{{ i18n "android_getkey_email_confirm" }}</label>
26+
<input x-model="checkoutData.emailConfirm" x-ref="emailConfirm" @blur="$refs.emailConfirm.classList.add('show-invalid')" type="email" class="input-box w-full" placeholder="{{ i18n "android_getkey_email_confirm_placeholder" }}" required/>
27+
</div>
2428
<div class="text-center mt-8">
2529
<p class="font-p mb-4">{{ i18n "android_getkey_instruction" }}</p>
2630
<p class="font-p mb-2">{{ partial "checkbox.html" (dict "context" . "alpineVariable" "acceptTerms" "label" (i18n "accept_terms_and_privacy" | safeHTML)) }}</p>

‎layouts/partials/supporter-cert-funder.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div x-data="{checkoutData: {prices: PADDLE_DESKTOP_PRICE_IDS.map(priceId => { return {priceId: priceId} }), discountedPrice: null, selectedPriceIndex: 1, quantity: 1, email: '', errorMessage: '', success: false, inProgress: false, licenseKey: null, acceptNewsletter: false, captcha: null}, acceptTerms: false, desktopLicense: null, captchaState: null}" x-init="desktopLicense = new DesktopLicense($refs.funderForm, checkoutData); desktopLicense.loadPrice()">
1+
<div x-data="{checkoutData: {prices: PADDLE_DESKTOP_PRICE_IDS.map(priceId => { return {priceId: priceId} }), discountedPrice: null, selectedPriceIndex: 1, quantity: 1, email: '', emailConfirm: '', errorMessage: '', success: false, inProgress: false, licenseKey: null, acceptNewsletter: false, captcha: null}, acceptTerms: false, desktopLicense: null, captchaState: null}" x-init="desktopLicense = new DesktopLicense($refs.funderForm, checkoutData); desktopLicense.loadPrice()">
22
<form x-show="!checkoutData.success" x-ref="funderForm" @submit.prevent="checkoutData.acceptNewsletter && subscribeToNewsletter(checkoutData.email, 'cryptomator', checkoutData.captcha); desktopLicense.checkout(checkoutData.prices[checkoutData.selectedPriceIndex].priceId, '{{ .Site.Language.Lang }}'); $refs.captcha.reset()">
33
<div class="flex flex-wrap md:flex-nowrap">
44
<fieldset class="w-full mb-4 md:w-2/3 md:pr-3">
@@ -28,6 +28,10 @@
2828
<label class="label-uppercase mb-2">{{ i18n "supporter_cert_common_email" }}</label>
2929
<input x-model="checkoutData.email" x-ref="email" @blur="$refs.email.classList.add('show-invalid')" type="email" class="input-box w-full" placeholder="{{ i18n "supporter_cert_common_email_placeholder" }}" required/>
3030
</div>
31+
<div class="mb-4">
32+
<label class="label-uppercase mb-2">{{ i18n "supporter_cert_common_email_confirm" }}</label>
33+
<input x-model="checkoutData.emailConfirm" x-ref="emailConfirm" @blur="$refs.emailConfirm.classList.add('show-invalid')" type="email" class="input-box w-full" placeholder="{{ i18n "supporter_cert_common_email_confirm_placeholder" }}" required/>
34+
</div>
3135
<div class="text-center mt-8">
3236
<p class="font-p mb-4">{{ i18n "supporter_cert_funder_instruction" }}</p>
3337
<p class="font-p mb-2">{{ partial "checkbox.html" (dict "context" . "alpineVariable" "acceptTerms" "label" (i18n "accept_terms_and_privacy" | safeHTML)) }}</p>

‎layouts/supporter-cert/list.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
1919
</div>
2020
</div>
2121

22-
<div x-data="{showTab: location.hash}" x-init="location.hash = showTab || '#funder'" @hashchange.window="showTab = location.hash" class="flex flex-col space-y-4 w-full relative">
22+
<div x-data="{showTab: location.hash}" x-init="location.hash = showTab || '#funder'" @hashchange.window="showTab = location.hash" class="flex flex-col space-y-4 w-full relative lg:min-h-[530px]">
2323
{{ range .Pages }}
2424
<div class="space-y-2 lg:space-y-0">
2525
<div class="w-full lg:pr-3 lg:w-1/2">

0 commit comments

Comments
 (0)