diff --git a/application/src/main/resources/static/js/main.js b/application/src/main/resources/static/js/main.js
index 2db2e606b1..727b25abf4 100644
--- a/application/src/main/resources/static/js/main.js
+++ b/application/src/main/resources/static/js/main.js
@@ -96,14 +96,14 @@ function sendVerificationCode(button, sendRequest) {
         sendRequest()
             .then(() => {
                 startCountdown();
-                Toast.success("发送成功");
+                Toast.success(i18nResources.sendVerificationCodeSuccess);
             })
             .catch((e) => {
                 button.disabled = false;
                 if (e instanceof Error) {
                     Toast.error(e.message);
                 } else {
-                    Toast.error("发送失败，请稍后再试");
+                    Toast.error(i18nResources.sendVerificationCodeFailed);
                 }
             });
     });
@@ -151,4 +151,3 @@ document.addEventListener("DOMContentLoaded", () => {
         }
     });
 });
-
diff --git a/application/src/main/resources/templates/challenges/two-factor/totp.properties b/application/src/main/resources/templates/challenges/two-factor/totp.properties
index 46f96ed978..dfea51a906 100644
--- a/application/src/main/resources/templates/challenges/two-factor/totp.properties
+++ b/application/src/main/resources/templates/challenges/two-factor/totp.properties
@@ -1,4 +1,4 @@
 title=两步验证
 messages.invalidError=错误的验证码
 form.code.label=验证码
-form.submit=验证
+form.submit=验证
\ No newline at end of file
diff --git a/application/src/main/resources/templates/challenges/two-factor/totp_es.properties b/application/src/main/resources/templates/challenges/two-factor/totp_es.properties
new file mode 100644
index 0000000000..43e5e25e1c
--- /dev/null
+++ b/application/src/main/resources/templates/challenges/two-factor/totp_es.properties
@@ -0,0 +1,4 @@
+title=Autenticación en Dos Pasos
+messages.invalidError=Código de verificación incorrecto
+form.code.label=Código de Verificación
+form.submit=Verificar
\ No newline at end of file
diff --git a/application/src/main/resources/templates/challenges/two-factor/totp_zh_TW.properties b/application/src/main/resources/templates/challenges/two-factor/totp_zh_TW.properties
new file mode 100644
index 0000000000..a2be3bc9c4
--- /dev/null
+++ b/application/src/main/resources/templates/challenges/two-factor/totp_zh_TW.properties
@@ -0,0 +1,4 @@
+title=兩步驗證
+messages.invalidError=錯誤的驗證碼
+form.code.label=驗證碼
+form.submit=驗證
diff --git a/application/src/main/resources/templates/gateway_modules/common_fragments.html b/application/src/main/resources/templates/gateway_modules/common_fragments.html
index 75d718ca33..dc5df4b1bb 100644
--- a/application/src/main/resources/templates/gateway_modules/common_fragments.html
+++ b/application/src/main/resources/templates/gateway_modules/common_fragments.html
@@ -1,13 +1,14 @@
 <th:block th:fragment="basicStaticResources">
+    <link rel="stylesheet" href="/webjars/normalize.css/8.0.1/normalize.css" />
+    <link rel="stylesheet" th:href="|/styles/main.css?v=${site.version}|" />
+
     <script th:inline="javascript">
-        const resources = {
-            title: `[(#{title})]`,
+        const i18nResources = {
+            sendVerificationCodeSuccess: `[(#{js.sendVerificationCode.success})]`,
+            sendVerificationCodeFailed: `[(#{js.sendVerificationCode.failed})]`,
         };
     </script>
 
-    <link rel="stylesheet" href="/webjars/normalize.css/8.0.1/normalize.css" />
-    <link rel="stylesheet" th:href="|/styles/main.css?v=${site.version}|" />
-
     <script src="/js/main.js"></script>
 </th:block>
 
@@ -67,7 +68,10 @@
                 const selectedLanguage = document.getElementById("language-select").value;
                 const currentURL = new URL(window.location.href);
                 currentURL.searchParams.set("language", selectedLanguage);
-                window.location.href = currentURL.toString();
+
+                history.replaceState(null, "", currentURL.toString());
+
+                window.location.reload();
             }
         </script>
     </div>
diff --git a/application/src/main/resources/templates/gateway_modules/common_fragments.properties b/application/src/main/resources/templates/gateway_modules/common_fragments.properties
index 6617dd0d7b..f079f83e50 100644
--- a/application/src/main/resources/templates/gateway_modules/common_fragments.properties
+++ b/application/src/main/resources/templates/gateway_modules/common_fragments.properties
@@ -1 +1,3 @@
-socialLogin.label=社交登录
\ No newline at end of file
+socialLogin.label=社交登录
+js.sendVerificationCode.success=发送成功
+js.sendVerificationCode.failed=发送失败，请稍后再试
\ No newline at end of file
diff --git a/application/src/main/resources/templates/gateway_modules/common_fragments_en.properties b/application/src/main/resources/templates/gateway_modules/common_fragments_en.properties
index a10abbb87c..cb299c93a5 100644
--- a/application/src/main/resources/templates/gateway_modules/common_fragments_en.properties
+++ b/application/src/main/resources/templates/gateway_modules/common_fragments_en.properties
@@ -1 +1,3 @@
-socialLogin.label=Social Login
\ No newline at end of file
+socialLogin.label=Social Login
+js.sendVerificationCode.success=Sent Successfully
+js.sendVerificationCode.failed=Sending Failed, Please Try Again Later
\ No newline at end of file
diff --git a/application/src/main/resources/templates/gateway_modules/common_fragments_es.properties b/application/src/main/resources/templates/gateway_modules/common_fragments_es.properties
new file mode 100644
index 0000000000..cbda753fe4
--- /dev/null
+++ b/application/src/main/resources/templates/gateway_modules/common_fragments_es.properties
@@ -0,0 +1,3 @@
+socialLogin.label=Inicio de Sesión Social
+js.sendVerificationCode.success=Enviado con éxito
+js.sendVerificationCode.failed=Error al enviar, por favor intente nuevamente más tarde
\ No newline at end of file
diff --git a/application/src/main/resources/templates/gateway_modules/common_fragments_zh_TW.properties b/application/src/main/resources/templates/gateway_modules/common_fragments_zh_TW.properties
new file mode 100644
index 0000000000..d55ad22de9
--- /dev/null
+++ b/application/src/main/resources/templates/gateway_modules/common_fragments_zh_TW.properties
@@ -0,0 +1,3 @@
+socialLogin.label=社交登入
+js.sendVerificationCode.success=發送成功
+js.sendVerificationCode.failed=發送失敗，請稍後再試
\ No newline at end of file
diff --git a/application/src/main/resources/templates/gateway_modules/login_fragments_en.properties b/application/src/main/resources/templates/gateway_modules/login_fragments_en.properties
index d3b5b33f46..90daeec12b 100644
--- a/application/src/main/resources/templates/gateway_modules/login_fragments_en.properties
+++ b/application/src/main/resources/templates/gateway_modules/login_fragments_en.properties
@@ -1,6 +1,6 @@
 messages.loginError=Invalid credentials.
 messages.logoutSuccess=Logout successfully.
-messages.signupSuccess=Congratulations! Sign up successfully, please sign in now.
+messages.signupSuccess=Congratulations! Sign up successfully, please login now.
 
 error.invalid-credential=Invalid credentials.
 error.rate-limit-exceeded=Too many requests, please try again later.
diff --git a/application/src/main/resources/templates/gateway_modules/login_fragments_es.properties b/application/src/main/resources/templates/gateway_modules/login_fragments_es.properties
new file mode 100644
index 0000000000..ae350b0a6b
--- /dev/null
+++ b/application/src/main/resources/templates/gateway_modules/login_fragments_es.properties
@@ -0,0 +1,13 @@
+messages.loginError=Credenciales inválidas.
+messages.logoutSuccess=Cierre de sesión exitoso.
+messages.signupSuccess=¡Felicidades! Registro exitoso, por favor inicie sesión de inmediato.
+
+error.invalid-credential=Credenciales inválidas.
+error.rate-limit-exceeded=Demasiadas solicitudes, por favor intente nuevamente más tarde.
+
+form.rememberMe.label=Mantener sesión iniciada
+form.submit=Iniciar sesión
+otherLogin.label=Otras formas de inicio de sesión
+signup.description=¿No tienes una cuenta?
+signup.link=Regístrate ahora
+returnToSite=Volver al sitio
diff --git a/application/src/main/resources/templates/gateway_modules/login_fragments_zh_TW.properties b/application/src/main/resources/templates/gateway_modules/login_fragments_zh_TW.properties
new file mode 100644
index 0000000000..42fb89cc01
--- /dev/null
+++ b/application/src/main/resources/templates/gateway_modules/login_fragments_zh_TW.properties
@@ -0,0 +1,13 @@
+messages.loginError=無效的憑證。
+messages.logoutSuccess=登出成功。
+messages.signupSuccess=恭喜！註冊成功，請立即登入。
+
+error.invalid-credential=無效的憑證。
+error.rate-limit-exceeded=請求過於頻繁，請稍後再試。
+
+form.rememberMe.label=保持登入會話
+form.submit=登入
+otherLogin.label=其他登入方式
+signup.description=沒有帳號？
+signup.link=立即註冊
+returnToSite=返回網站
diff --git a/application/src/main/resources/templates/login_es.properties b/application/src/main/resources/templates/login_es.properties
new file mode 100644
index 0000000000..44915466c1
--- /dev/null
+++ b/application/src/main/resources/templates/login_es.properties
@@ -0,0 +1 @@
+title=Iniciar Sesión
diff --git a/application/src/main/resources/templates/login_local_es.properties b/application/src/main/resources/templates/login_local_es.properties
new file mode 100644
index 0000000000..a13f85b92d
--- /dev/null
+++ b/application/src/main/resources/templates/login_local_es.properties
@@ -0,0 +1,3 @@
+form.username.label=Nombre de Usuario
+form.password.label=Contraseña
+form.password.forgot=¿Olvidaste tu contraseña?
diff --git a/application/src/main/resources/templates/login_local_zh_TW.properties b/application/src/main/resources/templates/login_local_zh_TW.properties
new file mode 100644
index 0000000000..83af5dba38
--- /dev/null
+++ b/application/src/main/resources/templates/login_local_zh_TW.properties
@@ -0,0 +1,3 @@
+form.username.label=使用者名稱
+form.password.label=密碼
+form.password.forgot=忘記密碼？
\ No newline at end of file
diff --git a/application/src/main/resources/templates/login_zh_TW.properties b/application/src/main/resources/templates/login_zh_TW.properties
new file mode 100644
index 0000000000..9f1b2d337b
--- /dev/null
+++ b/application/src/main/resources/templates/login_zh_TW.properties
@@ -0,0 +1 @@
+title=登入
diff --git a/application/src/main/resources/templates/logout_es.properties b/application/src/main/resources/templates/logout_es.properties
new file mode 100644
index 0000000000..ab74ddb056
--- /dev/null
+++ b/application/src/main/resources/templates/logout_es.properties
@@ -0,0 +1,3 @@
+title=Cerrar Sesión
+form.title=¿Estás seguro de que deseas cerrar sesión?
+form.submit=Cerrar Sesión
diff --git a/application/src/main/resources/templates/logout_zh_TW.properties b/application/src/main/resources/templates/logout_zh_TW.properties
new file mode 100644
index 0000000000..8d8fddf093
--- /dev/null
+++ b/application/src/main/resources/templates/logout_zh_TW.properties
@@ -0,0 +1,3 @@
+title=退出登入
+form.title=確定要退出登入嗎？
+form.submit=退出登入
diff --git a/application/src/main/resources/templates/password-reset-link.html b/application/src/main/resources/templates/password-reset-link.html
index 2a40d4d81b..5ce127ab34 100644
--- a/application/src/main/resources/templates/password-reset-link.html
+++ b/application/src/main/resources/templates/password-reset-link.html
@@ -34,6 +34,8 @@ <h1 class="form-title" th:text="#{title(${username})}"></h1>
                     </div>
                 </form>
             </div>
+
+            <div th:replace="~{gateway_modules/common_fragments::languageSwitcher}"></div>
         </div>
     </th:block>
-</html>
\ No newline at end of file
+</html>
diff --git a/application/src/main/resources/templates/password-reset-link_es.properties b/application/src/main/resources/templates/password-reset-link_es.properties
new file mode 100644
index 0000000000..406600dace
--- /dev/null
+++ b/application/src/main/resources/templates/password-reset-link_es.properties
@@ -0,0 +1,5 @@
+title=Cambiar Contraseña para {0}
+form.password.label=Contraseña
+form.confirmPassword.label=Confirmar Contraseña
+form.password.tips=La contraseña debe tener al menos 8 caracteres e incluir al menos una letra mayúscula, una letra minúscula, un número y un carácter especial.
+form.submit=Cambiar Contraseña
diff --git a/application/src/main/resources/templates/password-reset-link_zh_TW.properties b/application/src/main/resources/templates/password-reset-link_zh_TW.properties
new file mode 100644
index 0000000000..6b6a4c5bcd
--- /dev/null
+++ b/application/src/main/resources/templates/password-reset-link_zh_TW.properties
@@ -0,0 +1,5 @@
+title=為 {0} 修改密碼
+form.password.label=密碼
+form.confirmPassword.label=確認密碼
+form.password.tips=密碼必須至少包含 8 個字元，並且至少包含一個大寫字母、一個小寫字母、一個數字和一個特殊字元。
+form.submit=修改密碼
diff --git a/application/src/main/resources/templates/password-reset.html b/application/src/main/resources/templates/password-reset.html
index 3e198e1427..782a9a3a34 100644
--- a/application/src/main/resources/templates/password-reset.html
+++ b/application/src/main/resources/templates/password-reset.html
@@ -31,6 +31,8 @@ <h1 class="form-title" th:text="${sent} ? #{sent.title} : #{title}"></h1>
                     </div>
                 </form>
             </div>
+
+            <div th:replace="~{gateway_modules/common_fragments::languageSwitcher}"></div>
         </div>
     </th:block>
-</html>
+</html>
\ No newline at end of file
diff --git a/application/src/main/resources/templates/password-reset_es.properties b/application/src/main/resources/templates/password-reset_es.properties
new file mode 100644
index 0000000000..671e3e29e2
--- /dev/null
+++ b/application/src/main/resources/templates/password-reset_es.properties
@@ -0,0 +1,6 @@
+title=Restablecer Contraseña
+form.email.label=Correo Electrónico
+form.submit=Enviar
+sent.form.submit=Volver a la Página de Inicio de Sesión
+sent.form.message=Revisa tu correo electrónico para ver el enlace de restablecimiento de contraseña. Si no aparece en unos minutos, revisa tu carpeta de spam.
+sent.title=Correo de Restablecimiento de Contraseña Enviado
diff --git a/application/src/main/resources/templates/password-reset_zh_TW.properties b/application/src/main/resources/templates/password-reset_zh_TW.properties
new file mode 100644
index 0000000000..9b773cd893
--- /dev/null
+++ b/application/src/main/resources/templates/password-reset_zh_TW.properties
@@ -0,0 +1,6 @@
+title=重置密碼
+form.email.label=電子郵件
+form.submit=提交
+sent.form.submit=返回到登入頁面
+sent.form.message=檢查您的電子郵件中是否有重置密碼的連結。如果幾分鐘內沒有出現，請檢查您的垃圾郵件資料夾。
+sent.title=已發送重置密碼的郵件
diff --git a/application/src/main/resources/templates/signup.html b/application/src/main/resources/templates/signup.html
index 01186b5ae3..c1937a2d80 100644
--- a/application/src/main/resources/templates/signup.html
+++ b/application/src/main/resources/templates/signup.html
@@ -1,36 +1,42 @@
 <!doctype html>
 <html
-        xmlns:th="https://www.thymeleaf.org"
-        th:replace="~{gateway_modules/layout :: layout(title = |#{title} - ${site.title}|, head = ~{::head}, body = ~{::body})}"
+    xmlns:th="https://www.thymeleaf.org"
+    th:replace="~{gateway_modules/layout :: layout(title = |#{title} - ${site.title}|, head = ~{::head}, body = ~{::body})}"
 >
-<th:block th:fragment="head">
-    <style>
-        .signup-page-wrapper {
-            max-width: 35em;
-        }
-    </style>
-</th:block>
-<th:block th:fragment="body">
-    <div class="gateway-wrapper signup-page-wrapper">
-        <div th:replace="~{gateway_modules/common_fragments::haloLogo}"></div>
-        <div class="halo-form-wrapper">
-            <h1 class="form-title" th:text="#{title}"></h1>
-            <p class="alert alert=erro" role="alert" th:if="${error == 'invalid-email-code'}">
-                <span th:text="#{error.invalid-email-code}">Invalid email code</span>
-            </p>
-            <p class="alert alert=erro" role="alert" th:if="${error == 'rate-limit-exceeded'}">
-                <span th:text="#{error.rate-limit-exceeded}">Rate limit exceeded</span>
-            </p>
-            <p class="alert alert=erro" role="alert" th:if="${error == 'duplicate-name'}">
-                <span th:text="#{error.duplicate-name}">Duplicate name</span>
-            </p>
-            <form class="halo-form" name="signup-form" id="signup-form" th:action="@{/signup}" th:object="${form}"
-                  method="post">
-                <div class="form-item-group">
-                    <div class="form-item">
-                        <label for="username" th:text="#{form.username.label}"></label>
-                        <div class="form-input">
-                            <input
+    <th:block th:fragment="head">
+        <style>
+            .signup-page-wrapper {
+                max-width: 35em;
+            }
+        </style>
+    </th:block>
+    <th:block th:fragment="body">
+        <div class="gateway-wrapper signup-page-wrapper">
+            <div th:replace="~{gateway_modules/common_fragments::haloLogo}"></div>
+            <div class="halo-form-wrapper">
+                <h1 class="form-title" th:text="#{title}"></h1>
+                <p class="alert alert=erro" role="alert" th:if="${error == 'invalid-email-code'}">
+                    <span th:text="#{error.invalid-email-code}">Invalid email code</span>
+                </p>
+                <p class="alert alert=erro" role="alert" th:if="${error == 'rate-limit-exceeded'}">
+                    <span th:text="#{error.rate-limit-exceeded}">Rate limit exceeded</span>
+                </p>
+                <p class="alert alert=erro" role="alert" th:if="${error == 'duplicate-name'}">
+                    <span th:text="#{error.duplicate-name}">Duplicate name</span>
+                </p>
+                <form
+                    class="halo-form"
+                    name="signup-form"
+                    id="signup-form"
+                    th:action="@{/signup}"
+                    th:object="${form}"
+                    method="post"
+                >
+                    <div class="form-item-group">
+                        <div class="form-item">
+                            <label for="username" th:text="#{form.username.label}"></label>
+                            <div class="form-input">
+                                <input
                                     type="text"
                                     id="username"
                                     name="username"
@@ -41,18 +47,19 @@ <h1 class="form-title" th:text="#{title}"></h1>
                                     autofocus
                                     required
                                     th:field="*{username}"
-                            />
+                                />
+                            </div>
+                            <p
+                                class="alert alert-error"
+                                th:if="${#fields.hasErrors('username')}"
+                                th:errors="*{username}"
+                            ></p>
                         </div>
-                        <p class="alert alert-error"
-                           th:if="${#fields.hasErrors('username')}"
-                           th:errors="*{username}">
-                        </p>
-                    </div>
 
-                    <div class="form-item">
-                        <label for="displayName" th:text="#{form.displayName.label}"></label>
-                        <div class="form-input">
-                            <input
+                        <div class="form-item">
+                            <label for="displayName" th:text="#{form.displayName.label}"></label>
+                            <div class="form-input">
+                                <input
                                     type="text"
                                     id="displayName"
                                     name="displayName"
@@ -62,20 +69,21 @@ <h1 class="form-title" th:text="#{title}"></h1>
                                     autocapitalize="off"
                                     required
                                     th:field="*{displayName}"
-                            />
+                                />
+                            </div>
+                            <p
+                                class="alert alert-error"
+                                th:if="${#fields.hasErrors('displayName')}"
+                                th:errors="*{displayName}"
+                            ></p>
                         </div>
-                        <p class="alert alert-error"
-                           th:if="${#fields.hasErrors('displayName')}"
-                           th:errors="*{displayName}">
-                        </p>
                     </div>
-                </div>
 
-                <div class="form-item-group">
-                    <div class="form-item">
-                        <label for="email" th:text="#{form.email.label}"></label>
-                        <div class="form-input">
-                            <input
+                    <div class="form-item-group">
+                        <div class="form-item">
+                            <label for="email" th:text="#{form.email.label}"></label>
+                            <div class="form-input">
+                                <input
                                     type="email"
                                     id="email"
                                     name="email"
@@ -85,118 +93,120 @@ <h1 class="form-title" th:text="#{title}"></h1>
                                     autocapitalize="off"
                                     required
                                     th:field="*{email}"
-                            />
+                                />
+                            </div>
+                            <p class="alert alert-error" th:if="${#fields.hasErrors('email')}" th:errors="*{email}"></p>
                         </div>
-                        <p class="alert alert-error"
-                           th:if="${#fields.hasErrors('email')}"
-                           th:errors="*{email}">
-                        </p>
-                    </div>
 
-                    <div class="form-item" th:if="${globalInfo.mustVerifyEmailOnRegistration}">
-                        <label for="emailCode" th:text="#{form.emailCode.label}"></label>
-                        <div class="form-input-group">
-                            <div class="form-input">
-                                <input
+                        <div class="form-item" th:if="${globalInfo.mustVerifyEmailOnRegistration}">
+                            <label for="emailCode" th:text="#{form.emailCode.label}"></label>
+                            <div class="form-input-group">
+                                <div class="form-input">
+                                    <input
                                         type="text"
                                         inputmode="numeric"
                                         pattern="\d*"
                                         id="emailCode"
                                         name="emailCode"
                                         required
-                                />
-                            </div>
+                                    />
+                                </div>
 
-                            <button
+                                <button
                                     id="emailCodeSendButton"
                                     type="button"
                                     th:text="#{form.emailCode.sendButton}"
-                            ></button>
+                                ></button>
+                            </div>
+                            <p
+                                class="alert alert-error"
+                                th:if="${#fields.hasErrors('emailCode')}"
+                                th:errors="*{emailCode}"
+                            ></p>
                         </div>
-                        <p class="alert alert-error"
-                           th:if="${#fields.hasErrors('emailCode')}"
-                           th:errors="*{emailCode}">
-                        </p>
                     </div>
-                </div>
 
-                <div class="form-item">
-                    <label for="password" th:text="#{form.password.label}"></label>
-                    <th:block
+                    <div class="form-item">
+                        <label for="password" th:text="#{form.password.label}"></label>
+                        <th:block
                             th:replace="~{gateway_modules/input_fragments :: password(id = 'password', name = 'password', required = 'true', minlength = 6, enableToggle = true)}"
-                    ></th:block>
-                    <p class="alert alert-error"
-                       th:if="${#fields.hasErrors('password')}"
-                       th:errors="*{password}">
-                    </p>
-                </div>
+                        ></th:block>
+                        <p
+                            class="alert alert-error"
+                            th:if="${#fields.hasErrors('password')}"
+                            th:errors="*{password}"
+                        ></p>
+                    </div>
 
-                <div class="form-item">
-                    <label for="confirmPassword" th:text="#{form.confirmPassword.label}"></label>
-                    <th:block
+                    <div class="form-item">
+                        <label for="confirmPassword" th:text="#{form.confirmPassword.label}"></label>
+                        <th:block
                             th:replace="~{gateway_modules/input_fragments :: password(id = 'confirmPassword', name = null, required = 'true', minlength = 6, enableToggle = true)}"
-                    ></th:block>
-                    <p class="alert alert-error"
-                       th:if="${#fields.hasErrors('confirmPassword')}"
-                       th:errors="*{confirmPassword}">
-                    </p>
-                </div>
+                        ></th:block>
+                        <!-- <p -->
+                        <!--     class="alert alert-error" -->
+                        <!--     th:if="${#fields.hasErrors('confirmPassword')}" -->
+                        <!--     th:errors="*{confirmPassword}" -->
+                        <!-- ></p> -->
+                    </div>
 
-                <div class="form-item">
-                    <button type="submit" th:text="#{form.submit}"></button>
-                </div>
-            </form>
+                    <div class="form-item">
+                        <button type="submit" th:text="#{form.submit}"></button>
+                    </div>
+                </form>
 
-            <div th:replace="~{gateway_modules/common_fragments::socialAuthProviders}"></div>
+                <div th:replace="~{gateway_modules/common_fragments::socialAuthProviders}"></div>
+            </div>
+
+            <div th:replace="~{gateway_modules/common_fragments::languageSwitcher}"></div>
         </div>
-    </div>
-    <script th:inline="javascript">
-        document.addEventListener("DOMContentLoaded", function () {
-            function sendRequest() {
-                return new Promise((resolve, reject) => {
-                    const email = document.getElementById("email").value;
+        <script th:inline="javascript">
+            document.addEventListener("DOMContentLoaded", function () {
+                function sendRequest() {
+                    return new Promise((resolve, reject) => {
+                        const email = document.getElementById("email").value;
 
-                    if (!email) {
-                        throw new Error("请先输入邮箱地址");
-                    }
+                        if (!email) {
+                            throw new Error(/*[[#{form.emailCode.send.emptyValidation}]]*/);
+                        }
 
-                    fetch("/signup/send-email-code", {
-                        method: "POST",
-                        body: JSON.stringify({ email: email }),
-                        headers: {
-                            "Content-Type": "application/json",
-                            [[${_csrf.headerName}]]: [[${_csrf.token}]],
-                        },
-                    })
-                        .then((response) => {
-                            if (response.ok) {
-                                resolve(response);
-                            }
-                            reject(response);
+                        fetch("/signup/send-email-code", {
+                            method: "POST",
+                            body: JSON.stringify({ email: email }),
+                            headers: {
+                                "Content-Type": "application/json",
+                                [[${_csrf.headerName}]]: [[${_csrf.token}]],
+                            },
                         })
-                        .catch((e) => {
-                            reject(e);
-                        });
-                });
-            }
+                            .then((response) => {
+                                if (response.ok) {
+                                    resolve(response);
+                                }
+                                reject(response);
+                            })
+                            .catch((e) => {
+                                reject(e);
+                            });
+                    });
+                }
 
-            const emailCodeSendButton = document.getElementById("emailCodeSendButton");
-            sendVerificationCode(emailCodeSendButton, sendRequest);
+                const emailCodeSendButton = document.getElementById("emailCodeSendButton");
+                sendVerificationCode(emailCodeSendButton, sendRequest);
 
-            var password = document.getElementById("password"),
-                confirm_password = document.getElementById("confirmPassword");
+                var password = document.getElementById("password"),
+                    confirm_password = document.getElementById("confirmPassword");
 
-            function validatePassword() {
-                if (password.value != confirm_password.value) {
-                    confirm_password.setCustomValidity("Passwords Don't Match");
-                } else {
-                    confirm_password.setCustomValidity("");
+                function validatePassword() {
+                    if (password.value != confirm_password.value) {
+                        confirm_password.setCustomValidity("Passwords Don't Match");
+                    } else {
+                        confirm_password.setCustomValidity("");
+                    }
                 }
-            }
 
-            password.onchange = validatePassword;
-            confirm_password.onkeyup = validatePassword;
-        });
-    </script>
-</th:block>
-</html>
\ No newline at end of file
+                password.onchange = validatePassword;
+                confirm_password.onkeyup = validatePassword;
+            });
+        </script>
+    </th:block>
+</html>
diff --git a/application/src/main/resources/templates/signup.properties b/application/src/main/resources/templates/signup.properties
index ce6a56c6d9..8e307cc798 100644
--- a/application/src/main/resources/templates/signup.properties
+++ b/application/src/main/resources/templates/signup.properties
@@ -4,10 +4,11 @@ form.displayName.label=名称
 form.email.label=电子邮箱
 form.emailCode.label=邮箱验证码
 form.emailCode.sendButton=发送
+form.emailCode.send.emptyValidation=请先输入邮箱地址
 form.password.label=密码
 form.confirmPassword.label=确认密码
 form.submit=注册
 
 error.invalid-email-code=无效的邮箱验证码
 error.duplicate-name=用户名已经被注册
-error.rate-limit-exceeded=请求过于频繁，请稍后再试
+error.rate-limit-exceeded=请求过于频繁，请稍后再试
\ No newline at end of file
diff --git a/application/src/main/resources/templates/signup_en.properties b/application/src/main/resources/templates/signup_en.properties
index bdbb222060..fed3c49659 100644
--- a/application/src/main/resources/templates/signup_en.properties
+++ b/application/src/main/resources/templates/signup_en.properties
@@ -1,9 +1,14 @@
-title=Sign up
+title=Sign Up
 form.username.label=Username
-form.displayName.label=Display name
+form.displayName.label=Display Name
 form.email.label=Email
-form.emailCode.label=Email Code
+form.emailCode.label=Email Verification Code
 form.emailCode.sendButton=Send
+form.emailCode.send.emptyValidation=Please enter your email address first
 form.password.label=Password
-form.confirmPassword.label=Confirm password
-form.submit=Sign up
\ No newline at end of file
+form.confirmPassword.label=Confirm Password
+form.submit=Sign Up
+
+error.invalid-email-code=Invalid Email Verification Code
+error.duplicate-name=Username is already taken
+error.rate-limit-exceeded=Too many requests, please try again later
\ No newline at end of file
diff --git a/application/src/main/resources/templates/signup_es.properties b/application/src/main/resources/templates/signup_es.properties
new file mode 100644
index 0000000000..747860645f
--- /dev/null
+++ b/application/src/main/resources/templates/signup_es.properties
@@ -0,0 +1,14 @@
+title=Registrarse
+form.username.label=Nombre de Usuario
+form.displayName.label=Nombre
+form.email.label=Correo Electrónico
+form.emailCode.label=Código de Verificación
+form.emailCode.sendButton=Enviar
+form.emailCode.send.emptyValidation=Por favor, introduce tu dirección de correo electrónico primero
+form.password.label=Contraseña
+form.confirmPassword.label=Confirmar Contraseña
+form.submit=Registrarse
+
+error.invalid-email-code=Código de verificación del correo inválido
+error.duplicate-name=El nombre de usuario ya está registrado
+error.rate-limit-exceeded=Demasiadas solicitudes, por favor intente nuevamente más tarde
\ No newline at end of file
diff --git a/application/src/main/resources/templates/signup_zh_TW.properties b/application/src/main/resources/templates/signup_zh_TW.properties
new file mode 100644
index 0000000000..597c7052b4
--- /dev/null
+++ b/application/src/main/resources/templates/signup_zh_TW.properties
@@ -0,0 +1,14 @@
+title=註冊
+form.username.label=使用者名稱
+form.displayName.label=名稱
+form.email.label=電子郵件
+form.emailCode.label=郵箱驗證碼
+form.emailCode.sendButton=發送
+form.emailCode.send.emptyValidation=請先輸入電子郵件地址
+form.password.label=密碼
+form.confirmPassword.label=確認密碼
+form.submit=註冊
+
+error.invalid-email-code=無效的郵箱驗證碼
+error.duplicate-name=使用者名稱已經被註冊
+error.rate-limit-exceeded=請求過於頻繁，請稍後再試
\ No newline at end of file