From 8c8679ce593d5b6280319c6ebef4f4bcbec1cef6 Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 30 Dec 2021 09:32:31 +0100 Subject: [PATCH 1/5] update forms in other languages --- pages/forms/extra-storage-mailbox/form.de.md | 2 +- pages/forms/extra-storage-mailbox/form.es.md | 3 +++ pages/forms/extra-storage-mailbox/form.fr.md | 9 ++++++--- pages/forms/extra-storage-mailbox/form.it.md | 2 ++ pages/forms/extra-storage-space/form.de.md | 7 +++---- pages/forms/extra-storage-space/form.es.md | 3 ++- pages/forms/extra-storage-space/form.fr.md | 1 + .../extra-storage-space/thankyou/formdata.fr.md | 12 ++++++++++++ 8 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 pages/forms/extra-storage-space/thankyou/formdata.fr.md diff --git a/pages/forms/extra-storage-mailbox/form.de.md b/pages/forms/extra-storage-mailbox/form.de.md index cfb14705..88d704fc 100644 --- a/pages/forms/extra-storage-mailbox/form.de.md +++ b/pages/forms/extra-storage-mailbox/form.de.md @@ -47,7 +47,7 @@ form: - name: country label: 'Land (notwendig wegen VAT)' - placeholder: 'Kontoheimat' + placeholder: 'Bitte geben Sie das Land an, in dem Ihr Bankkonto oder Zahlungsdienst registriert ist' type: text validate: pattern: '[A-Za-z]*' diff --git a/pages/forms/extra-storage-mailbox/form.es.md b/pages/forms/extra-storage-mailbox/form.es.md index ca72a297..1c0b01ec 100644 --- a/pages/forms/extra-storage-mailbox/form.es.md +++ b/pages/forms/extra-storage-mailbox/form.es.md @@ -25,6 +25,8 @@ form: name: 'Espacio adicional de buzón' label: 'Espacio adicional en GB' type: number + classes: form-number + outerclasses: form-outer validate: min: 1 max: 10 @@ -60,6 +62,7 @@ form: bank: 'Transferencia bancaria (SEPA countries only)' faircoin: Faircoin bitcoin: Bitcoin + patreon: Patreon validate: required: true - diff --git a/pages/forms/extra-storage-mailbox/form.fr.md b/pages/forms/extra-storage-mailbox/form.fr.md index 7c375cab..7e18c33d 100644 --- a/pages/forms/extra-storage-mailbox/form.fr.md +++ b/pages/forms/extra-storage-mailbox/form.fr.md @@ -23,8 +23,10 @@ form: required: true - name: 'Additional Inbox Storage' - label: 'Esapce supplémentaire en GB' + label: 'Espace supplémentaire en Go' type: number + classes: form-number + outerclasses: form-outer validate: min: 1 max: 10 @@ -51,7 +53,7 @@ form: required: true - name: payment - label: 'Paiement par' + label: 'Paiement par (Peut être soumis à des frais de transaction supplémentaires)' placeholder: select type: select options: @@ -102,5 +104,6 @@ form:

Espace de stockage supplémentaire

-

Il est possible d'étendre la capacité de stockage de votre messagerie jusqu'à 10 Go pour le coût de 0,15 euro par Go et par mois, payé annuellement. Pour demander de l'espace de stockage supplémentaire pour votre messagerie et votre compte cloud, vous devez remplir ce [formulaire](https://disroot.org/en/forms/extra-storage-space)


+

+Il est possible d'étendre la capacité de stockage de votre messagerie jusqu'à 10 Go pour le coût de 0,15 euro par Go et par mois, payé annuellement. Pour demander de l'espace de stockage supplémentaire pour votre messagerie et votre compte cloud, vous devez remplir ce [formulaire](https://disroot.org/en/forms/extra-storage-space)


diff --git a/pages/forms/extra-storage-mailbox/form.it.md b/pages/forms/extra-storage-mailbox/form.it.md index 4a402de0..b20d8edd 100644 --- a/pages/forms/extra-storage-mailbox/form.it.md +++ b/pages/forms/extra-storage-mailbox/form.it.md @@ -25,6 +25,8 @@ form: name: 'Additional Inbox Storage' label: 'Memoria aggiuntiva in GB' type: number + classes: form-number + outerclasses: form-outer validate: min: 1 max: 10 diff --git a/pages/forms/extra-storage-space/form.de.md b/pages/forms/extra-storage-space/form.de.md index c5ce6bda..8f682d10 100644 --- a/pages/forms/extra-storage-space/form.de.md +++ b/pages/forms/extra-storage-space/form.de.md @@ -46,7 +46,7 @@ form: - name: country label: 'Land (notwendig wegen VAT)' - placeholder: 'Kontoheimat' + placeholder: 'Bitte geben Sie das Land an, in dem Ihr Bankkonto oder Zahlungsdienst registriert ist' type: text validate: pattern: '[A-Za-z]*' @@ -111,6 +111,5 @@ form: display: thankyou --- -# Zusätzlicher Speicherplatz - -Es besteht die Möglichkeit, Deinen Cloud-Speicherplatz auf 14, 29 oder 54 GB zu erweitern für monatlich 0,15 €/GB. Du kannst Dich auch entscheiden, den zusätzlichen Speicherplatz teilweise oder vollständig für zusätzlichen Email-Speicherplatz zu nutzen. In dem Fall schreibe Deine Wünsche möglichst genau in den Kommentarbereich des Anfrageformulars. +

Zusätzlicher Speicherplatz

+

Es besteht die Möglichkeit, Deinen Cloud-Speicherplatz auf 14, 29 oder 54 GB zu erweitern für monatlich 0,15 €/GB. Du kannst Dich auch entscheiden, den zusätzlichen Speicherplatz teilweise oder vollständig für zusätzlichen Email-Speicherplatz zu nutzen. In dem Fall schreibe Deine Wünsche möglichst genau in den Kommentarbereich des Anfrageformulars.

diff --git a/pages/forms/extra-storage-space/form.es.md b/pages/forms/extra-storage-space/form.es.md index d62c6d4a..da516ce0 100644 --- a/pages/forms/extra-storage-space/form.es.md +++ b/pages/forms/extra-storage-space/form.es.md @@ -61,6 +61,7 @@ form: bank: 'Transferencia bancaria (SEPA countries only)' faircoin: Faircoin bitcoin: Bitcoin + patreon: Patreon validate: required: true - @@ -70,7 +71,7 @@ form: default: yearly options: monthly: Mensual - yearly: Mensual/Anual + yearly: Anual validate: required: true - diff --git a/pages/forms/extra-storage-space/form.fr.md b/pages/forms/extra-storage-space/form.fr.md index 7b7d6534..a8545276 100644 --- a/pages/forms/extra-storage-space/form.fr.md +++ b/pages/forms/extra-storage-space/form.fr.md @@ -61,6 +61,7 @@ form: bank: 'Virement bancaire (pays SEPA uniquement)' faircoin: Faircoin bitcoin: Bitcoin + patreon: Patreon validate: required: true - diff --git a/pages/forms/extra-storage-space/thankyou/formdata.fr.md b/pages/forms/extra-storage-space/thankyou/formdata.fr.md new file mode 100644 index 00000000..67306f3b --- /dev/null +++ b/pages/forms/extra-storage-space/thankyou/formdata.fr.md @@ -0,0 +1,12 @@ +--- +title: 'Demande d'espace supplémentaire' +cache_enable: false +process: + twig: true +--- + +

**Nous avons reçu votre demande.

Vous recevrez une confirmation par e-mail avec votre référence de facturation.
Dès que nous recevrons votre paiement, nous vous attribuerons l'espace supplémentaire.

Merci de soutenir Disroot!'** +
+
+
+**Voici un résumé de la demande reçue:** -- 2.30.2 From 9bd298d6cf933d212a42ba7ee4344a944211ba6b Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 30 Dec 2021 09:52:16 +0100 Subject: [PATCH 2/5] remove extra ' --- pages/forms/extra-storage-space/thankyou/formdata.de.md | 2 +- pages/forms/extra-storage-space/thankyou/formdata.en.md | 2 +- pages/forms/extra-storage-space/thankyou/formdata.fr.md | 2 +- pages/forms/extra-storage-space/thankyou/formdata.it.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/forms/extra-storage-space/thankyou/formdata.de.md b/pages/forms/extra-storage-space/thankyou/formdata.de.md index 1da5f62b..5b7a4613 100644 --- a/pages/forms/extra-storage-space/thankyou/formdata.de.md +++ b/pages/forms/extra-storage-space/thankyou/formdata.de.md @@ -5,7 +5,7 @@ process: twig: true --- -<

**Wir haben Deine Anfrage erhalten.

Du wirst eine Bestätigung per Email mit den Zahlunganweisungen erhalten.
Wenn wir Deine Zahlung erhalten haben, werden wir Dir den zusätzlichen Speicherplatz zuweisen.

Vielen Dank für Deine Unterstützung von Disroot!'** +<

**Wir haben Deine Anfrage erhalten.

Du wirst eine Bestätigung per Email mit den Zahlunganweisungen erhalten.
Wenn wir Deine Zahlung erhalten haben, werden wir Dir den zusätzlichen Speicherplatz zuweisen.

Vielen Dank für Deine Unterstützung von Disroot!**

diff --git a/pages/forms/extra-storage-space/thankyou/formdata.en.md b/pages/forms/extra-storage-space/thankyou/formdata.en.md index 25349c29..ea90d09b 100644 --- a/pages/forms/extra-storage-space/thankyou/formdata.en.md +++ b/pages/forms/extra-storage-space/thankyou/formdata.en.md @@ -5,7 +5,7 @@ process: twig: true --- -

**We have received your request.

You will get a confirmation per E-mail with you billing reference.
Once we receive your payment we will assign you the extra storage.

Thank you for supporting Disroot!'** +

**We have received your request.

You will get a confirmation per E-mail with you billing reference.
Once we receive your payment we will assign you the extra storage.

Thank you for supporting Disroot!**

diff --git a/pages/forms/extra-storage-space/thankyou/formdata.fr.md b/pages/forms/extra-storage-space/thankyou/formdata.fr.md index 67306f3b..3231c8d6 100644 --- a/pages/forms/extra-storage-space/thankyou/formdata.fr.md +++ b/pages/forms/extra-storage-space/thankyou/formdata.fr.md @@ -5,7 +5,7 @@ process: twig: true --- -

**Nous avons reçu votre demande.

Vous recevrez une confirmation par e-mail avec votre référence de facturation.
Dès que nous recevrons votre paiement, nous vous attribuerons l'espace supplémentaire.

Merci de soutenir Disroot!'** +

**Nous avons reçu votre demande.

Vous recevrez une confirmation par e-mail avec votre référence de facturation.
Dès que nous recevrons votre paiement, nous vous attribuerons l'espace supplémentaire.

Merci de soutenir Disroot!**

diff --git a/pages/forms/extra-storage-space/thankyou/formdata.it.md b/pages/forms/extra-storage-space/thankyou/formdata.it.md index 6130f273..28c24635 100644 --- a/pages/forms/extra-storage-space/thankyou/formdata.it.md +++ b/pages/forms/extra-storage-space/thankyou/formdata.it.md @@ -5,7 +5,7 @@ process: twig: true --- -

**Abbiamo ricevuto la vostra richiesta.

Riceverai una conferma via e-mail con il tuo riferimento di fatturazione.
Una volta ricevuto il tuo pagamento ti assegneremo il deposito extra.

Grazie per il sostegno a Disroot!'** +

**Abbiamo ricevuto la vostra richiesta.

Riceverai una conferma via e-mail con il tuo riferimento di fatturazione.
Una volta ricevuto il tuo pagamento ti assegneremo il deposito extra.

Grazie per il sostegno a Disroot!**

-- 2.30.2 From 86a0e8126ed34095ea389446cb8de6cd10d6e7ac Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 30 Dec 2021 09:57:41 +0100 Subject: [PATCH 3/5] change ' by " --- pages/forms/extra-storage-space/thankyou/formdata.fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/forms/extra-storage-space/thankyou/formdata.fr.md b/pages/forms/extra-storage-space/thankyou/formdata.fr.md index 3231c8d6..aeb623f0 100644 --- a/pages/forms/extra-storage-space/thankyou/formdata.fr.md +++ b/pages/forms/extra-storage-space/thankyou/formdata.fr.md @@ -1,5 +1,5 @@ --- -title: 'Demande d'espace supplémentaire' +title: "Demande d'espace supplémentaire" cache_enable: false process: twig: true -- 2.30.2 From 80f8efc67c1a635da6704c394b38b9d0b5bcec47 Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 30 Dec 2021 10:05:10 +0100 Subject: [PATCH 4/5] fix translation of thankyou that should be translated --- pages/forms/extra-storage-space/form.fr.md | 2 +- pages/forms/extra-storage-space/form.it.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/forms/extra-storage-space/form.fr.md b/pages/forms/extra-storage-space/form.fr.md index a8545276..9a05da34 100644 --- a/pages/forms/extra-storage-space/form.fr.md +++ b/pages/forms/extra-storage-space/form.fr.md @@ -107,7 +107,7 @@ form: - message: 'Votre demande a été envoyée!' - - display: Merci + display: thankyou ---

Espace de stockage supplémentaire

diff --git a/pages/forms/extra-storage-space/form.it.md b/pages/forms/extra-storage-space/form.it.md index d1e22d73..0391ac4b 100644 --- a/pages/forms/extra-storage-space/form.it.md +++ b/pages/forms/extra-storage-space/form.it.md @@ -107,7 +107,7 @@ form: - message: 'La tua richiesta è stata inviata!' - - display: grazie + display: thankyou ---

Spazio di archiviazione extra

-- 2.30.2 From a3e5492db9d1818cf9854a174024981a1ceee417 Mon Sep 17 00:00:00 2001 From: meaz Date: Thu, 30 Dec 2021 10:20:12 +0100 Subject: [PATCH 5/5] fix name var that you should not be translated --- pages/forms/extra-storage-space/form.es.md | 16 ++++++++-------- pages/forms/extra-storage-space/form.fr.md | 4 ++-- pages/forms/extra-storage-space/form.it.md | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pages/forms/extra-storage-space/form.es.md b/pages/forms/extra-storage-space/form.es.md index da516ce0..11ff72f1 100644 --- a/pages/forms/extra-storage-space/form.es.md +++ b/pages/forms/extra-storage-space/form.es.md @@ -4,7 +4,7 @@ form: name: 'Espacio de Almacenamiento Extra' fields: - - name: Nombre de usuario + name: username label: 'Nombre de usuario' placeholder: 'Ingresa el nombre de usuario de Disroot' autofocus: 'on' @@ -14,7 +14,7 @@ form: pattern: '[A-Za-z0-9.]*' required: true - - name: Correo + name: email label: 'Dirección de correo de Contacto' placeholder: 'Ingresa una dirección de correo para contactarte' type: text @@ -22,7 +22,7 @@ form: pattern: '[A-Za-z0-9.-_@]*' required: true - - name: 'Cantidad de espacio' + name: 'Amount of Space' label: 'Espacio total de almacenamiento' type: select default: 14GB @@ -33,17 +33,17 @@ form: validate: required: true - - name: Comentarios + name: comments type: textarea - - name: 'Detalles del Pago' + name: 'payment details' type: display size: large label: ' ' markdown: true content: '**Detalles del Pago:**' - - name: País + name: country label: 'País (Necesario por razones de I.V.A)' placeholder: 'Por favor, especifica el país en el que está registrada tu cuenta de pago' type: text @@ -51,7 +51,7 @@ form: pattern: '[A-Za-z]*' required: true - - name: Pago + name: payment label: 'Pago a través de: (Podría estar sujeto a costos adicionales de transacción)' placeholder: select type: select @@ -65,7 +65,7 @@ form: validate: required: true - - name: Frecuencia + name: frequency label: Mensual/Anual type: radio default: yearly diff --git a/pages/forms/extra-storage-space/form.fr.md b/pages/forms/extra-storage-space/form.fr.md index 9a05da34..ddaa362e 100644 --- a/pages/forms/extra-storage-space/form.fr.md +++ b/pages/forms/extra-storage-space/form.fr.md @@ -22,7 +22,7 @@ form: pattern: '[A-Za-z0-9.-_@]*' required: true - - name: "Quantité d'espace" + name: 'Amount of Space' label: "Espace de stockage total" type: select default: 14GB @@ -36,7 +36,7 @@ form: name: comments type: textarea - - name: 'Informations de paiement' + name: 'payment details' type: display size: large label: ' ' diff --git a/pages/forms/extra-storage-space/form.it.md b/pages/forms/extra-storage-space/form.it.md index 0391ac4b..8b29cacc 100644 --- a/pages/forms/extra-storage-space/form.it.md +++ b/pages/forms/extra-storage-space/form.it.md @@ -33,10 +33,10 @@ form: validate: required: true - - name: commenti + name: comments type: textarea - - name: 'Dettagli del pagamento' + name: 'payment details' type: display size: large label: ' ' -- 2.30.2