From e7093f9b2b2a056f6fdd777c61b6aaecda3ff2fb Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Thu, 17 Sep 2026 20:36:05 +0200
Subject: [PATCH] Remove the old password registration template

`password.html` and the two "continue with" labels it needed have no caller
left.
---
 templates/pages/register/password.html | 83 --------------------------
 translations/en.json                   | 22 +++----
 2 files changed, 8 insertions(+), 97 deletions(-)
 delete mode 100644 templates/pages/register/password.html

diff --git a/templates/pages/register/password.html b/templates/pages/register/password.html
deleted file mode 100644
index d181d5428..000000000
--- a/templates/pages/register/password.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{#
-Copyright 2025, 2026 Element Creations Ltd.
-Copyright 2024, 2025 New Vector Ltd.
-Copyright 2021-2024 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
--#}
-
-{% extends "base.html" %}
-
-{% block content %}
-  <header class="page-heading">
-    <div class="icon">
-      {{ icon.user_profile_solid() }}
-    </div>
-
-    <div class="header">
-      <h1 class="title">{{ _("mas.register.create_account.heading") }}</h1>
-    </div>
-  </header>
-
-  <form method="POST" class="cpd-form-root">
-    {% for error in form.errors %}
-      {# Special case for the captcha error, as we want to put it at the bottom #}
-      {% if error.kind != "captcha" %}
-        <div class="text-critical font-medium">
-          {{ errors.form_error_message(error=error) }}
-        </div>
-      {% endif %}
-    {% endfor %}
-
-    <input type="hidden" name="csrf" value="{{ csrf_token }}" />
-
-    {% call(f) field.field(label=_("common.username"), name="username", form_state=form) %}
-      <input {{ field.attributes(f) }} class="cpd-text-control" type="text" autocomplete="username" autocorrect="off" autocapitalize="none" required data-choose-username />
-      {{ field.error(error={"kind": "policy", "code": "username-invalid-chars"}, hidden=true) }}
-    {% endcall %}
-
-    {% if features.password_registration_email_required %}
-      {% call(f) field.field(label=_("common.email_address"), name="email", form_state=form) %}
-        <input {{ field.attributes(f) }} class="cpd-text-control" type="email" autocomplete="email" required />
-      {% endcall %}
-    {% endif %}
-
-    {% call(f) field.field(label=_("common.password"), name="password", form_state=form) %}
-      <input {{ field.attributes(f) }} class="cpd-text-control" type="password" autocomplete="new-password" required />
-    {% endcall %}
-
-    {% call(f) field.field(label=_("common.password_confirm"), name="password_confirm", form_state=form) %}
-      <input {{ field.attributes(f) }} class="cpd-text-control" type="password" autocomplete="new-password" required />
-    {% endcall %}
-
-    {% if branding.tos_uri is not none %}
-      {% call(f) field.field(label=_("mas.register.terms_of_service", tos_uri=branding.tos_uri), name="accept_terms", form_state=form, inline=true, class="my-4") %}
-        <div class="cpd-form-inline-field-control">
-          <div class="cpd-checkbox-container">
-            <input {{ field.attributes(f) }} class="cpd-checkbox-input" type="checkbox" required />
-            <div class="cpd-checkbox-ui">
-              {{ icon.check() }}
-            </div>
-          </div>
-        </div>
-      {% endcall %}
-    {% endif %}
-
-    {{ captcha.form(class="mb-4 self-center") }}
-
-    {% for error in form.errors %}
-      {# Special case for the captcha error #}
-      {% if error.kind == "captcha" %}
-        <div class="text-critical font-medium text-center -mt-4 mb-4">
-          {{ errors.form_error_message(error=error) }}
-        </div>
-      {% endif %}
-    {% endfor %}
-
-    {{ button.button(text=_("action.continue")) }}
-
-    {% set params = next["params"] | default({}) | to_params(prefix="?") %}
-    {{ button.link_tertiary(text=_("mas.register.call_to_login"), href="/login" ~ params) }}
-  </form>
-{% endblock content %}
diff --git a/translations/en.json b/translations/en.json
index fe095d6d4..e2ed07916 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -10,7 +10,7 @@
     },
     "continue": "Continue",
     "@continue": {
-      "context": "form_post.html:26:28-48, pages/consent.html:71:28-48, pages/device_link.html:54:28-48, pages/login.html:68:30-50, pages/reauth.html:32:28-48, pages/recovery/start.html:38:26-46, pages/register/index.html:84:28-48, pages/register/password.html:78:26-46, pages/register/steps/display_name.html:43:28-48, pages/register/steps/registration_token.html:41:28-48, pages/register/steps/verify_email.html:51:26-46, pages/sso.html:52:28-48"
+      "context": "form_post.html:26:28-48, pages/consent.html:71:28-48, pages/device_link.html:54:28-48, pages/login.html:68:30-50, pages/reauth.html:32:28-48, pages/recovery/start.html:38:26-46, pages/register/index.html:84:28-48, pages/register/steps/display_name.html:43:28-48, pages/register/steps/registration_token.html:41:28-48, pages/register/steps/verify_email.html:51:26-46, pages/sso.html:52:28-48"
     },
     "create_account": "Create Account",
     "@create_account": {
@@ -79,7 +79,7 @@
     },
     "email_address": "Email address",
     "@email_address": {
-      "context": "pages/recovery/start.html:34:33-58, pages/register/index.html:48:37-62, pages/register/password.html:41:35-60, pages/upstream_oauth2/do_register.html:115:37-62"
+      "context": "pages/recovery/start.html:34:33-58, pages/register/index.html:48:37-62, pages/upstream_oauth2/do_register.html:115:37-62"
     },
     "loading": "Loading…",
     "@loading": {
@@ -91,15 +91,15 @@
     },
     "password": "Password",
     "@password": {
-      "context": "pages/login.html:56:37-57, pages/reauth.html:28:35-55, pages/register/index.html:53:35-55, pages/register/password.html:46:33-53"
+      "context": "pages/login.html:56:37-57, pages/reauth.html:28:35-55, pages/register/index.html:53:35-55"
     },
     "password_confirm": "Confirm password",
     "@password_confirm": {
-      "context": "pages/register/index.html:57:35-63, pages/register/password.html:50:33-61"
+      "context": "pages/register/index.html:57:35-63"
     },
     "username": "Username",
     "@username": {
-      "context": "pages/login.html:51:39-59, pages/register/index.html:39:35-55, pages/register/password.html:35:33-53, pages/upstream_oauth2/do_register.html:101:35-55, pages/upstream_oauth2/do_register.html:107:39-59"
+      "context": "pages/login.html:51:39-59, pages/register/index.html:39:35-55, pages/upstream_oauth2/do_register.html:101:35-55, pages/upstream_oauth2/do_register.html:107:39-59"
     }
   },
   "error": {
@@ -688,24 +688,18 @@
     "register": {
       "call_to_login": "Already have an account?",
       "@call_to_login": {
-        "context": "pages/register/index.html:101:33-64, pages/register/password.html:81:33-64",
+        "context": "pages/register/index.html:101:33-64",
         "description": "Displayed on the registration page to suggest to log in instead"
       },
-      "continue_with_email": "Continue with email address",
-      "@continue_with_email": {},
-      "continue_with_password": "Continue with password",
-      "@continue_with_password": {},
       "create_account": {
-        "description": "Choose a username to continue.",
-        "@description": {},
         "heading": "Create an account",
         "@heading": {
-          "context": "pages/register/index.html:22:27-67, pages/register/password.html:19:27-67"
+          "context": "pages/register/index.html:22:27-67"
         }
       },
       "terms_of_service": "I agree to the <a href=\"%s\" data-kind=\"primary\" class=\"cpd-link\">Terms and Conditions</a>",
       "@terms_of_service": {
-        "context": "pages/register/index.html:62:37-97, pages/register/password.html:55:35-95, pages/upstream_oauth2/do_register.html:180:35-95"
+        "context": "pages/register/index.html:62:37-97, pages/upstream_oauth2/do_register.html:180:35-95"
       }
     },
     "registration_token": {