Merge branch 'issue-12795' into panel.sutty.nl

app/views/devise/registrations/new.haml

@@ -40,20 +40,19 @@
           aria: { describedby: 'minimum-password-length' },
           placeholder: t("#{password}_confirmation")
 
-      - if params[:consent]
+      .form-group
-        .form-group
+        - Usuarie::CONSENT_FIELDS.each do |field|
-          - Usuarie::CONSENT_FIELDS.each do |field|
+          - required = t(".#{field}.required", default: '').present?
-            - required = t(".#{field}.required", default: '').present?
+          - id = "usuarie_#{field}"
-            - id = "usuarie_#{field}"
+          - name = "usuarie[#{field}]"
-            - name = "usuarie[#{field}]"
+          - content = t(".#{field}.label")
-            - content = t(".#{field}.label")
+          - href = t(".#{field}.href", default: '')
-            - href = t(".#{field}.href", default: '')
+          - help_content = t(".#{field}.help")
-            - help_content = t(".#{field}.help")
+          = render 'bootstrap/custom_checkbox', id: id, name: name, content: content, required: required, value: "1" do
-            = render 'bootstrap/custom_checkbox', id: id, name: name, content: content, required: required, value: "1" do
+            - if href.present?
-              - if href.present?
+              = link_to help_content, href, target: '_blank', rel: 'noopener'
-                = link_to help_content, href, target: '_blank', rel: 'noopener'
+            - else
-              - else
+              = help_content
-                = help_content
 
       .actions
         = f.submit t('.sign_up'),

config/locales/devise.views.en.yml

@@ -105,17 +105,17 @@ en:
         sign_up: Sign up
         help: We only ask for an e-mail address and a password.  The password is safely stored, no one else besides you knows it!  You'll also receive an e-mail to confirm your account.
         privacy_policy_accepted:
-          label: "I know about Sutty's privacy policy"
+          label: "I understand and accept the privacy policy"
           help: "Read privacy policy"
           href: "https://sutty.nl/en/privacy-policy/"
           required: true
         terms_of_service_accepted:
-          label: "My sites won't promote hate towards minorities"
+          label: "My sites won't promote hate speech"
           help: "Read terms of service"
           href: "https://sutty.nl/en/terms-of-service/"
           required: true
         code_of_conduct_accepted:
-          label: "My sites are inclusive spaces"
+          label: "I want a more inclusive Internet"
           help: "Read codes for sharing"
           href: "https://sutty.nl/en/code-of-conduct/"
           required: true

config/locales/devise.views.es.yml

@@ -105,17 +105,17 @@ es:
         sign_up: Registrarme
         help: Para registrarte solo pedimos una dirección de correo y una contraseña.  La contraseña se almacena de forma segura, ¡nadie más que vos la sabe!  Recibirás un correo de confirmación de cuenta.
         privacy_policy_accepted:
-          label: "Conozco la política de privacidad de Sutty"
+          label: "Comprendo y acepto la política de privacidad"
           help: "Leer política de privacidad"
           href: "https://sutty.nl/politica-de-privacidad/"
           required: "true"
         terms_of_service_accepted:
-          label: "Mis sitios no promueven el odio a minorías"
+          label: "Mis sitios no promueven el discurso de odio"
           help: "Leer términos de servicio"
           href: "https://sutty.nl/terminos-de-servicio/"
           required: "true"
         code_of_conduct_accepted:
-          label: "Mis sitios son espacios inclusivos"
+          label: "Quiero una Internet más inclusiva"
           help: "Leer códigos para compartir"
           href: "https://sutty.nl/codigo-de-convivencia/"
           required: "true"