From 151e533067b4db40217cbdba12213a971dcd1887 Mon Sep 17 00:00:00 2001
From: DamsFX <contact@hounddd.fr>
Date: Fri, 14 Mar 2025 03:31:52 +0100
Subject: [PATCH 1/3] Translate frontend components

---
 components/account/activation_check.htm |  8 ++--
 components/account/deactivate_link.htm  | 12 +++---
 components/account/register.htm         | 20 +++++-----
 components/account/signin.htm           | 12 +++---
 components/account/update.htm           | 20 +++++-----
 lang/en/frontend.php                    | 49 +++++++++++++++++++++++++
 lang/fr/frontend.php                    | 49 +++++++++++++++++++++++++
 7 files changed, 134 insertions(+), 36 deletions(-)
 create mode 100644 lang/en/frontend.php
 create mode 100644 lang/fr/frontend.php

diff --git a/components/account/activation_check.htm b/components/account/activation_check.htm
index 5030833..b8b41b1 100644
--- a/components/account/activation_check.htm
+++ b/components/account/activation_check.htm
@@ -1,9 +1,9 @@
 {% if not user.is_activated %}
 
-    <h3>Your email address has not yet been verified.</h3>
+    <h3>{{ 'winter.user::frontend.activate.title' | trans }}</h3>
     <p>
-        You should verify your account otherwise it may be deleted. Please check your email to verify.
-        <a href="javascript:;" data-request="onSendActivationEmail">Send the verification email again</a>.
+        {{ 'winter.user::frontend.activate.infos' | trans }}
+        <a href="javascript:;" data-request="onSendActivationEmail">{{ 'winter.user::frontend.activate.link' | trans }}</a>.
     </p>
 
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/components/account/deactivate_link.htm b/components/account/deactivate_link.htm
index 5c8cc2d..bcab627 100644
--- a/components/account/deactivate_link.htm
+++ b/components/account/deactivate_link.htm
@@ -10,26 +10,26 @@
     onclick="toggleAccountDeactivateForm()"
     class="deactivate"
 >
-    Deactivate account
+    {{ 'winter.user::frontend.deactivate.link' | trans }}
 </a>
 
 <div id="accountDeactivateForm" style="display: none">
     {{ form_ajax('onDeactivate') }}
-        <h3>Deactivate your account?</h3>
+        <h3>{{ 'winter.user::frontend.deactivate.title' | trans }}</h3>
         <p>
-            Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.
+            {{ 'winter.user::frontend.deactivate.infos' | trans }}
         </p>
         <div class="form-group">
-            <label for="accountDeletePassword">To continue, please enter your password:</label>
+            <label for="accountDeletePassword">{{ 'winter.user::frontend.deactivate.enter_password' | trans }}</label>
             <input name="password" type="password" class="form-control" id="accountDeletePassword" />
         </div>
         <button type="submit" class="btn btn-danger">
-            Confirm Deactivate Account
+            {{ 'winter.user::frontend.deactivate.button' | trans }}
         </button>
         <a
             href="javascript:;"
             onclick="toggleAccountDeactivateForm()">
-            I changed my mind
+            {{ 'winter.user::frontend.deactivate.mind_changed' | trans }}
         </a>
     {{ form_close() }}
 </div>
diff --git a/components/account/register.htm b/components/account/register.htm
index a14715d..9e8f7b2 100644
--- a/components/account/register.htm
+++ b/components/account/register.htm
@@ -1,52 +1,52 @@
 {% if canRegister %}
-    <h3>Register</h3>
+    <h3>{{ 'winter.user::frontend.register.title' | trans }}</h3>
 
     {{ form_ajax('onRegister') }}
 
         <div class="form-group">
-            <label for="registerName">Full Name</label>
+            <label for="registerName">{{ 'winter.user::frontend.general.full_name' | trans }}</label>
             <input
                 name="name"
                 type="text"
                 class="form-control"
                 id="registerName"
-                placeholder="Enter your full name"/>
+                placeholder="{{ 'winter.user::frontend.general.full_name_placeholder' | trans }}"/>
         </div>
 
         <div class="form-group">
-            <label for="registerEmail">Email</label>
+            <label for="registerEmail">{{ 'winter.user::frontend.general.email' | trans }}</label>
             <input
                 name="email"
                 type="email"
                 class="form-control"
                 id="registerEmail"
-                placeholder="Enter your email"/>
+                placeholder="{{ 'winter.user::frontend.general.email_placeholder' | trans }}"/>
         </div>
 
         {% if loginAttribute == "username" %}
             <div class="form-group">
-                <label for="registerUsername">Username</label>
+                <label for="registerUsername">{{ 'winter.user::frontend.general.username' | trans }}</label>
                 <input
                     name="username"
                     type="text"
                     class="form-control"
                     id="registerUsername"
-                    placeholder="Enter your username"/>
+                    placeholder="{{ 'winter.user::frontend.general.username_placeholder' | trans }}"/>
             </div>
         {% endif %}
 
         <div class="form-group">
-            <label for="registerPassword">Password</label>
+            <label for="registerPassword">{{ 'winter.user::frontend.general.password' | trans }}</label>
             <input
                 name="password"
                 type="password"
                 class="form-control"
                 id="registerPassword"
-                placeholder="Choose a password"
+                placeholder="{{ 'winter.user::frontend.general.password_placeholder' | trans }}"
                 autocomplete="new-password"/>
         </div>
 
-        <button type="submit" class="btn btn-default">Register</button>
+        <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.register.button' | trans }}</button>
 
     {{ form_close() }}
 {% else %}
diff --git a/components/account/signin.htm b/components/account/signin.htm
index b4c4188..9d0a39f 100644
--- a/components/account/signin.htm
+++ b/components/account/signin.htm
@@ -1,4 +1,4 @@
-<h3>Sign in</h3>
+<h3>{{ 'winter.user::frontend.signin.title' | trans }}</h3>
 
 {{ form_ajax('onSignin') }}
     <div class="form-group">
@@ -8,29 +8,29 @@ <h3>Sign in</h3>
             type="text"
             class="form-control"
             id="userSigninLogin"
-            placeholder="Enter your {{ loginAttributeLabel|lower }}"
+            placeholder="{{ 'winter.user::frontend.general.enter_placeholder' | trans({attribute: loginAttributeLabel | lower}) }}"
             autocomplete="username"/>
     </div>
 
     <div class="form-group">
-        <label for="userSigninPassword">Password</label>
+        <label for="userSigninPassword">{{ 'winter.user::frontend.general.password' | trans }}</label>
         <input
             name="password"
             type="password"
             class="form-control"
             id="userSigninPassword"
-            placeholder="Enter your password"
+            placeholder="{{ 'winter.user::frontend.signin.password_placeholder' | trans }}"
             autocomplete="current-password"/>
     </div>
 
     {% if rememberLoginMode == 'ask' %}
     <div class="form-group">
         <div class="checkbox">
-        <label><input name="remember" type="checkbox" value="1">Stay logged in</label>
+        <label><input name="remember" type="checkbox" value="1"> {{ 'winter.user::frontend.signin.remember' | trans }}</label>
         </div>
     </div>
     {% endif %}
 
-    <button type="submit" class="btn btn-default">Sign in</button>
+    <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.signin.button' | trans }}</button>
 
 {{ form_close() }}
diff --git a/components/account/update.htm b/components/account/update.htm
index f2ad0f3..794f300 100644
--- a/components/account/update.htm
+++ b/components/account/update.htm
@@ -1,29 +1,29 @@
-<h3>Profile</h3>
+<h3>{{ 'winter.user::frontend.update.title' | trans }}</h3>
 
 {{ form_ajax('onUpdate', { flash: 1 }) }}
 
     <div class="form-group">
-        <label for="accountName">Full Name</label>
+        <label for="accountName">{{ 'winter.user::frontend.general.full_name' | trans }}</label>
         <input name="name" type="text" class="form-control" id="accountName" value="{{ user.name }}">
     </div>
 
     <div class="form-group">
-        <label for="accountEmail">Email</label>
+        <label for="accountEmail">{{ 'winter.user::frontend.general.email' | trans }}</label>
         <input name="email" type="email" class="form-control" id="accountEmail" value="{{ user.email }}">
     </div>
 
     <div class="form-group">
-        <label for="accountPassword">New Password</label>
+        <label for="accountPassword">{{ 'winter.user::frontend.update.new_password' | trans }}</label>
         <input name="password" type="password" class="form-control" id="accountPassword">
     </div>
 
     <div class="form-group">
-        <label for="accountPasswordConfirm">Confirm New Password</label>
+        <label for="accountPasswordConfirm">{{ 'winter.user::frontend.update.new_password_confirm' | trans }}</label>
         <input name="password_confirmation" type="password" class="form-control" id="accountPasswordConfirm">
     </div>
 
     <div class="form-group">
-        <label for="accountAvatar">Display Picture</label>
+        <label for="accountAvatar">{{ 'winter.user::frontend.update.avatar' | trans }}</label>
         <input
             name="avatar"
             type="file"
@@ -35,19 +35,19 @@ <h3>Profile</h3>
 
         {% if user.avatar %}
             <a href="javascript:;" data-request="onRemoveAvatar" data-request-flash class="remove-avatar">
-                Remove current display picture
+                {{ 'winter.user::frontend.update.avatar_remove' | trans }}
             </a>
         {% endif %}
     </div>
 
     {% if updateRequiresPassword %}
-        <p>To change these details, please confirm your current password.</p>
+        <p>{{ 'winter.user::frontend.update.password_required' | trans }}</p>
         <div class="form-group">
-            <label for="accountPasswordCurrent">Current Password <small class="text-danger">* required</small></label>
+            <label for="accountPasswordCurrent">{{ 'winter.user::frontend.update.password_current' | trans }} <small class="text-danger">* {{ 'winter.user::frontend.general.required' | trans }}</small></label>
             <input name="password_current" type="password" class="form-control" id="accountPasswordCurrent">
         </div>
     {% endif %}
 
-    <button type="submit" class="btn btn-default">Save</button>
+    <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.update.button' | trans }}</button>
 
 {{ form_close() }}
diff --git a/lang/en/frontend.php b/lang/en/frontend.php
new file mode 100644
index 0000000..fe02833
--- /dev/null
+++ b/lang/en/frontend.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    'general' => [
+        'email' => 'Email',
+        'email_placeholder' => 'Enter your email',
+        'enter_placeholder' => 'Enter your :attribute',
+        'full_name' => 'Full Name',
+        'full_name_placeholder' => 'Enter your full name',
+        'username' => 'Username',
+        'username_placeholder' => 'Enter your username',
+        'password' => 'Password',
+        'password_placeholder' => 'Choose a password',
+        'required' => 'required',
+    ],
+    'activate' => [
+        'title' => 'Your email address has not yet been verified.',
+        'infos' => 'You should verify your account otherwise it may be deleted. Please check your email to verify.',
+        'link' => 'Send the verification email again',
+    ],
+    'deactivate' => [
+        'title' => 'Deactivate your account?',
+        'button' => 'Confirm Deactivate Account',
+        'enter_password' => 'To continue, please enter your password:',
+        'infos' => 'Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.',
+        'link' => 'Deactivate account',
+        'mind_changed' => 'I changed my mind',
+    ],
+    'register' => [
+        'title' => 'Register',
+        'button' => 'Register',
+    ],
+    'signin' => [
+        'title' => 'Sign In',
+        'button' => 'Sign In',
+        'password_placeholder' => 'Enter your password',
+        'remember' => 'Stay logged in',
+    ],
+    'update' => [
+        'title' => 'Profile',
+        'button' => 'Save',
+        'avatar' => 'Display Picture',
+        'avatar_remove' => 'Remove current display picture',
+        'password_current' => 'Current Password',
+        'password_required' => 'To change these details, please confirm your current password.',
+        'new_password' => 'New password',
+        'new_password_confirm' => 'Confirm New Password',
+    ],
+];
diff --git a/lang/fr/frontend.php b/lang/fr/frontend.php
new file mode 100644
index 0000000..8e0f2a6
--- /dev/null
+++ b/lang/fr/frontend.php
@@ -0,0 +1,49 @@
+<?php
+
+return [
+    'general' => [
+        'email' => 'E-mail',
+        'email_placeholder' => 'Saisissez votre e-mail',
+        'enter_placeholder' => 'Saisissez votre :attribute',
+        'full_name' => 'Nom complet',
+        'full_name_placeholder' => 'Saisissez votre nom complet',
+        'username' => 'Pseudo',
+        'username_placeholder' => 'Entrez votre pseudo',
+        'password' => 'Mot de passe',
+        'password_placeholder' => 'Choisir un mot de passe',
+        'required' => 'requis',
+    ],
+    'activate' => [
+        'title' => 'Votre adresse e-mail n\'a pas encore été vérifiée.',
+        'infos' => 'Vous devez vérifier votre compte, faute de quoi il pourrait être supprimé. Veuillez vérifier votre courrier électronique.',
+        'link' => 'Renvoyer l\'e-mail de vérification',
+    ],
+    'deactivate' => [
+        'title' => 'Désactiver votre compte ?',
+        'button' => 'Confirmer la désactivation du compte',
+        'enter_password' => 'Pour continuer, veuillez saisir votre mot de passe actuel :',
+        'infos' => 'Votre compte sera désactivé et vos données seront supprimées du site. Vous pouvez réactiver votre compte à tout moment en vous reconnectant.',
+        'link' => 'Désactiver le compte',
+        'mind_changed' => 'J\'ai changé d\'avis',
+    ],
+    'register' => [
+        'title' => 'S\'enregistrer',
+        'button' => 'S\'enregistrer',
+    ],
+    'signin' => [
+        'title' => 'S\'authentifier',
+        'button' => 'S\'authentifier',
+        'password_placeholder' => 'Entrez votre mot de passe',
+        'remember' => 'Rester connecté',
+    ],
+    'update' => [
+        'title' => 'Profil',
+        'button' => 'Enregistrer',
+        'avatar' => 'Image de présentation',
+        'avatar_remove' => 'Supprimer l\'image de présentation actuelle',
+        'password_current' => 'Mot de passe actuel',
+        'password_required' => 'Pour modifier ces données, veuillez confirmer votre mot de passe actuel.',
+        'new_password' => 'Nouveau mot de passe',
+        'new_password_confirm' => 'Confirmer le nouveau mot de passe',
+    ],
+];

From 9a98577b102411e075c4d251205332cf1b23e862 Mon Sep 17 00:00:00 2001
From: DamsFX <contact@hounddd.fr>
Date: Tue, 18 Mar 2025 19:05:51 +0100
Subject: [PATCH 2/3] Following Luke's suggestions for translations

---
 components/account/activation_check.htm |  6 +--
 components/account/deactivate_link.htm  | 12 +++---
 components/account/register.htm         |  4 +-
 components/account/signin.htm           |  8 ++--
 components/account/update.htm           | 16 +++----
 lang/en/frontend.php                    | 54 +++++++++++-------------
 lang/fr/frontend.php                    | 56 +++++++++++--------------
 7 files changed, 72 insertions(+), 84 deletions(-)

diff --git a/components/account/activation_check.htm b/components/account/activation_check.htm
index b8b41b1..1d4c1b9 100644
--- a/components/account/activation_check.htm
+++ b/components/account/activation_check.htm
@@ -1,9 +1,9 @@
 {% if not user.is_activated %}
 
-    <h3>{{ 'winter.user::frontend.activate.title' | trans }}</h3>
+    <h3>{{ 'winter.user::frontend.email_not_verified.title' | trans }}</h3>
     <p>
-        {{ 'winter.user::frontend.activate.infos' | trans }}
-        <a href="javascript:;" data-request="onSendActivationEmail">{{ 'winter.user::frontend.activate.link' | trans }}</a>.
+        {{ 'winter.user::frontend.email_not_verified.description' | trans }}
+        <a href="javascript:;" data-request="onSendActivationEmail">{{ 'winter.user::frontend.resend_verification_email' | trans }}</a>.
     </p>
 
 {% endif %}
diff --git a/components/account/deactivate_link.htm b/components/account/deactivate_link.htm
index bcab627..7c75c12 100644
--- a/components/account/deactivate_link.htm
+++ b/components/account/deactivate_link.htm
@@ -10,26 +10,26 @@
     onclick="toggleAccountDeactivateForm()"
     class="deactivate"
 >
-    {{ 'winter.user::frontend.deactivate.link' | trans }}
+    {{ 'winter.user::frontend.deactivate_account.title' | trans }}
 </a>
 
 <div id="accountDeactivateForm" style="display: none">
     {{ form_ajax('onDeactivate') }}
-        <h3>{{ 'winter.user::frontend.deactivate.title' | trans }}</h3>
+        <h3>{{ 'winter.user::frontend.deactivate_account.prompt' | trans }}</h3>
         <p>
-            {{ 'winter.user::frontend.deactivate.infos' | trans }}
+            {{ 'winter.user::frontend.deactivate_account.description' | trans }}
         </p>
         <div class="form-group">
-            <label for="accountDeletePassword">{{ 'winter.user::frontend.deactivate.enter_password' | trans }}</label>
+            <label for="accountDeletePassword">{{ 'winter.user::frontend.continue_with_password' | trans }}</label>
             <input name="password" type="password" class="form-control" id="accountDeletePassword" />
         </div>
         <button type="submit" class="btn btn-danger">
-            {{ 'winter.user::frontend.deactivate.button' | trans }}
+            {{ 'winter.user::frontend.confirm' | trans }}
         </button>
         <a
             href="javascript:;"
             onclick="toggleAccountDeactivateForm()">
-            {{ 'winter.user::frontend.deactivate.mind_changed' | trans }}
+            {{ 'winter.user::frontend.deactivate_account.cancel' | trans }}
         </a>
     {{ form_close() }}
 </div>
diff --git a/components/account/register.htm b/components/account/register.htm
index 9e8f7b2..b393355 100644
--- a/components/account/register.htm
+++ b/components/account/register.htm
@@ -1,5 +1,5 @@
 {% if canRegister %}
-    <h3>{{ 'winter.user::frontend.register.title' | trans }}</h3>
+    <h3>{{ 'winter.user::frontend.general.register' | trans }}</h3>
 
     {{ form_ajax('onRegister') }}
 
@@ -46,7 +46,7 @@ <h3>{{ 'winter.user::frontend.register.title' | trans }}</h3>
                 autocomplete="new-password"/>
         </div>
 
-        <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.register.button' | trans }}</button>
+        <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.general.register' | trans }}</button>
 
     {{ form_close() }}
 {% else %}
diff --git a/components/account/signin.htm b/components/account/signin.htm
index 9d0a39f..d98f3ee 100644
--- a/components/account/signin.htm
+++ b/components/account/signin.htm
@@ -1,4 +1,4 @@
-<h3>{{ 'winter.user::frontend.signin.title' | trans }}</h3>
+<h3>{{ 'winter.user::frontend.general.signin' | trans }}</h3>
 
 {{ form_ajax('onSignin') }}
     <div class="form-group">
@@ -8,7 +8,7 @@ <h3>{{ 'winter.user::frontend.signin.title' | trans }}</h3>
             type="text"
             class="form-control"
             id="userSigninLogin"
-            placeholder="{{ 'winter.user::frontend.general.enter_placeholder' | trans({attribute: loginAttributeLabel | lower}) }}"
+            placeholder="{{ 'winter.user::frontend.general.login_placeholder' | trans({attribute: loginAttributeLabel | lower}) }}"
             autocomplete="username"/>
     </div>
 
@@ -26,11 +26,11 @@ <h3>{{ 'winter.user::frontend.signin.title' | trans }}</h3>
     {% if rememberLoginMode == 'ask' %}
     <div class="form-group">
         <div class="checkbox">
-        <label><input name="remember" type="checkbox" value="1"> {{ 'winter.user::frontend.signin.remember' | trans }}</label>
+        <label><input name="remember" type="checkbox" value="1"> {{ 'winter.user::frontend.general.remember' | trans }}</label>
         </div>
     </div>
     {% endif %}
 
-    <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.signin.button' | trans }}</button>
+    <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.general.signin' | trans }}</button>
 
 {{ form_close() }}
diff --git a/components/account/update.htm b/components/account/update.htm
index 794f300..6357f4a 100644
--- a/components/account/update.htm
+++ b/components/account/update.htm
@@ -1,4 +1,4 @@
-<h3>{{ 'winter.user::frontend.update.title' | trans }}</h3>
+<h3>{{ 'winter.user::frontend.general.profile' | trans }}</h3>
 
 {{ form_ajax('onUpdate', { flash: 1 }) }}
 
@@ -13,17 +13,17 @@ <h3>{{ 'winter.user::frontend.update.title' | trans }}</h3>
     </div>
 
     <div class="form-group">
-        <label for="accountPassword">{{ 'winter.user::frontend.update.new_password' | trans }}</label>
+        <label for="accountPassword">{{ 'winter.user::frontend.general.password_new' | trans }}</label>
         <input name="password" type="password" class="form-control" id="accountPassword">
     </div>
 
     <div class="form-group">
-        <label for="accountPasswordConfirm">{{ 'winter.user::frontend.update.new_password_confirm' | trans }}</label>
+        <label for="accountPasswordConfirm">{{ 'winter.user::frontend.general.password_new_confirm' | trans }}</label>
         <input name="password_confirmation" type="password" class="form-control" id="accountPasswordConfirm">
     </div>
 
     <div class="form-group">
-        <label for="accountAvatar">{{ 'winter.user::frontend.update.avatar' | trans }}</label>
+        <label for="accountAvatar">{{ 'winter.user::frontend.general.avatar' | trans }}</label>
         <input
             name="avatar"
             type="file"
@@ -35,19 +35,19 @@ <h3>{{ 'winter.user::frontend.update.title' | trans }}</h3>
 
         {% if user.avatar %}
             <a href="javascript:;" data-request="onRemoveAvatar" data-request-flash class="remove-avatar">
-                {{ 'winter.user::frontend.update.avatar_remove' | trans }}
+                {{ 'winter.user::frontend.general.avatar_remove' | trans }}
             </a>
         {% endif %}
     </div>
 
     {% if updateRequiresPassword %}
-        <p>{{ 'winter.user::frontend.update.password_required' | trans }}</p>
+        <p>{{ 'winter.user::frontend.password_required_update' | trans }}</p>
         <div class="form-group">
-            <label for="accountPasswordCurrent">{{ 'winter.user::frontend.update.password_current' | trans }} <small class="text-danger">* {{ 'winter.user::frontend.general.required' | trans }}</small></label>
+            <label for="accountPasswordCurrent">{{ 'winter.user::frontend.general.password_current' | trans }} <small class="text-danger">* {{ 'winter.user::frontend.general.required' | trans }}</small></label>
             <input name="password_current" type="password" class="form-control" id="accountPasswordCurrent">
         </div>
     {% endif %}
 
-    <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.update.button' | trans }}</button>
+    <button type="submit" class="btn btn-default">{{ 'winter.user::frontend.general.save' | trans }}</button>
 
 {{ form_close() }}
diff --git a/lang/en/frontend.php b/lang/en/frontend.php
index fe02833..681cf19 100644
--- a/lang/en/frontend.php
+++ b/lang/en/frontend.php
@@ -1,49 +1,43 @@
 <?php
 
 return [
+    'confirm' => 'Confirm Deactivate Account',
+    'continue_with_password' => 'To continue, please enter your password:',
+    'password_required_update' => 'To change these details, please confirm your current password.',
+    'resend_verification_email' => 'Send the verification email again',
     'general' => [
+        'avatar' => 'Display Picture',
+        'avatar_remove' => 'Remove current display picture',
         'email' => 'Email',
         'email_placeholder' => 'Enter your email',
-        'enter_placeholder' => 'Enter your :attribute',
         'full_name' => 'Full Name',
         'full_name_placeholder' => 'Enter your full name',
-        'username' => 'Username',
-        'username_placeholder' => 'Enter your username',
+        'login_placeholder' => 'Enter your :attribute',
         'password' => 'Password',
+        'password_current' => 'Current Password',
+        'password_new' => 'New password',
+        'password_new_confirm' => 'Confirm New Password',
         'password_placeholder' => 'Choose a password',
+        'profile' => 'Profile',
+        'register' => 'Register',
+        'remember' => 'Stay logged in',
         'required' => 'required',
+        'save' => 'Save',
+        'signin' => 'Sign In',
+        'username' => 'Username',
+        'username_placeholder' => 'Enter your username',
     ],
-    'activate' => [
+    'email_not_verified' => [
+        'description' => 'You should verify your account otherwise it may be deleted. Please check your email to verify.',
         'title' => 'Your email address has not yet been verified.',
-        'infos' => 'You should verify your account otherwise it may be deleted. Please check your email to verify.',
-        'link' => 'Send the verification email again',
-    ],
-    'deactivate' => [
-        'title' => 'Deactivate your account?',
-        'button' => 'Confirm Deactivate Account',
-        'enter_password' => 'To continue, please enter your password:',
-        'infos' => 'Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.',
-        'link' => 'Deactivate account',
-        'mind_changed' => 'I changed my mind',
     ],
-    'register' => [
-        'title' => 'Register',
-        'button' => 'Register',
+    'deactivate_account' => [
+        'cancel' => 'I changed my mind',
+        'description' => 'Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.',
+        'prompt' => 'Deactivate your account?',
+        'title' => 'Deactivate account',
     ],
     'signin' => [
-        'title' => 'Sign In',
-        'button' => 'Sign In',
         'password_placeholder' => 'Enter your password',
-        'remember' => 'Stay logged in',
-    ],
-    'update' => [
-        'title' => 'Profile',
-        'button' => 'Save',
-        'avatar' => 'Display Picture',
-        'avatar_remove' => 'Remove current display picture',
-        'password_current' => 'Current Password',
-        'password_required' => 'To change these details, please confirm your current password.',
-        'new_password' => 'New password',
-        'new_password_confirm' => 'Confirm New Password',
     ],
 ];
diff --git a/lang/fr/frontend.php b/lang/fr/frontend.php
index 8e0f2a6..839b875 100644
--- a/lang/fr/frontend.php
+++ b/lang/fr/frontend.php
@@ -1,49 +1,43 @@
 <?php
 
 return [
+    'confirm' => 'Confirmer la désactivation du compte',
+    'continue_with_password' => 'Pour continuer, veuillez saisir votre mot de passe actuel :',
+    'password_required_update' => 'Pour modifier ces données, veuillez confirmer votre mot de passe actuel.',
+    'resend_verification_email' => 'Renvoyer l\'e-mail de vérification',
     'general' => [
+        'avatar' => 'Image de présentation',
+        'avatar_remove' => 'Supprimer l\'image de présentation actuelle',
         'email' => 'E-mail',
         'email_placeholder' => 'Saisissez votre e-mail',
-        'enter_placeholder' => 'Saisissez votre :attribute',
         'full_name' => 'Nom complet',
         'full_name_placeholder' => 'Saisissez votre nom complet',
-        'username' => 'Pseudo',
-        'username_placeholder' => 'Entrez votre pseudo',
+        'login_placeholder' => 'Saisissez votre :attribute',
         'password' => 'Mot de passe',
+        'password_current' => 'Mot de passe actuel',
+        'password_new' => 'Nouveau mot de passe',
+        'password_new_confirm' => 'Confirmer le nouveau mot de passe',
         'password_placeholder' => 'Choisir un mot de passe',
+        'profile' => 'Profil',
+        'register' => 'S\'enregistrer',
+        'remember' => 'Rester connecté',
         'required' => 'requis',
+        'save' => 'Enregistrer',
+        'signin' => 'S\'authentifier',
+        'username' => 'Pseudo',
+        'username_placeholder' => 'Saisissez votre pseudo',
     ],
-    'activate' => [
+    'email_not_verified' => [
+        'description' => 'Vous devez vérifier votre compte, faute de quoi il pourrait être supprimé. Veuillez vérifier votre courrier électronique.',
         'title' => 'Votre adresse e-mail n\'a pas encore été vérifiée.',
-        'infos' => 'Vous devez vérifier votre compte, faute de quoi il pourrait être supprimé. Veuillez vérifier votre courrier électronique.',
-        'link' => 'Renvoyer l\'e-mail de vérification',
     ],
-    'deactivate' => [
-        'title' => 'Désactiver votre compte ?',
-        'button' => 'Confirmer la désactivation du compte',
-        'enter_password' => 'Pour continuer, veuillez saisir votre mot de passe actuel :',
-        'infos' => 'Votre compte sera désactivé et vos données seront supprimées du site. Vous pouvez réactiver votre compte à tout moment en vous reconnectant.',
-        'link' => 'Désactiver le compte',
-        'mind_changed' => 'J\'ai changé d\'avis',
-    ],
-    'register' => [
-        'title' => 'S\'enregistrer',
-        'button' => 'S\'enregistrer',
+    'deactivate_account' => [
+        'cancel' => 'J\'ai changé d\'avis',
+        'description' => 'Votre compte sera désactivé et vos données seront supprimées du site. Vous pouvez réactiver votre compte à tout moment en vous reconnectant.',
+        'prompt' => 'Désactiver votre compte ?',
+        'title' => 'Désactiver le compte',
     ],
     'signin' => [
-        'title' => 'S\'authentifier',
-        'button' => 'S\'authentifier',
-        'password_placeholder' => 'Entrez votre mot de passe',
-        'remember' => 'Rester connecté',
-    ],
-    'update' => [
-        'title' => 'Profil',
-        'button' => 'Enregistrer',
-        'avatar' => 'Image de présentation',
-        'avatar_remove' => 'Supprimer l\'image de présentation actuelle',
-        'password_current' => 'Mot de passe actuel',
-        'password_required' => 'Pour modifier ces données, veuillez confirmer votre mot de passe actuel.',
-        'new_password' => 'Nouveau mot de passe',
-        'new_password_confirm' => 'Confirmer le nouveau mot de passe',
+        'password_placeholder' => 'Saisissez votre mot de passe',
     ],
 ];

From 264ea7ce164f6024119c7031550734b74d197e02 Mon Sep 17 00:00:00 2001
From: DamsFX <contact@hounddd.fr>
Date: Wed, 19 Mar 2025 16:07:06 +0100
Subject: [PATCH 3/3] Update deactivate account confirm button

---
 components/account/deactivate_link.htm | 2 +-
 lang/en/frontend.php                   | 2 +-
 lang/fr/frontend.php                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/account/deactivate_link.htm b/components/account/deactivate_link.htm
index 7c75c12..1373421 100644
--- a/components/account/deactivate_link.htm
+++ b/components/account/deactivate_link.htm
@@ -24,7 +24,7 @@ <h3>{{ 'winter.user::frontend.deactivate_account.prompt' | trans }}</h3>
             <input name="password" type="password" class="form-control" id="accountDeletePassword" />
         </div>
         <button type="submit" class="btn btn-danger">
-            {{ 'winter.user::frontend.confirm' | trans }}
+            {{ 'winter.user::frontend.deactivate_account.confirm' | trans }}
         </button>
         <a
             href="javascript:;"
diff --git a/lang/en/frontend.php b/lang/en/frontend.php
index 681cf19..53c8b56 100644
--- a/lang/en/frontend.php
+++ b/lang/en/frontend.php
@@ -1,7 +1,6 @@
 <?php
 
 return [
-    'confirm' => 'Confirm Deactivate Account',
     'continue_with_password' => 'To continue, please enter your password:',
     'password_required_update' => 'To change these details, please confirm your current password.',
     'resend_verification_email' => 'Send the verification email again',
@@ -33,6 +32,7 @@
     ],
     'deactivate_account' => [
         'cancel' => 'I changed my mind',
+        'confirm' => 'Confirm Deactivate Account',
         'description' => 'Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.',
         'prompt' => 'Deactivate your account?',
         'title' => 'Deactivate account',
diff --git a/lang/fr/frontend.php b/lang/fr/frontend.php
index 839b875..a1839d8 100644
--- a/lang/fr/frontend.php
+++ b/lang/fr/frontend.php
@@ -1,7 +1,6 @@
 <?php
 
 return [
-    'confirm' => 'Confirmer la désactivation du compte',
     'continue_with_password' => 'Pour continuer, veuillez saisir votre mot de passe actuel :',
     'password_required_update' => 'Pour modifier ces données, veuillez confirmer votre mot de passe actuel.',
     'resend_verification_email' => 'Renvoyer l\'e-mail de vérification',
@@ -33,6 +32,7 @@
     ],
     'deactivate_account' => [
         'cancel' => 'J\'ai changé d\'avis',
+        'confirm' => 'Confirmer la désactivation du compte',
         'description' => 'Votre compte sera désactivé et vos données seront supprimées du site. Vous pouvez réactiver votre compte à tout moment en vous reconnectant.',
         'prompt' => 'Désactiver votre compte ?',
         'title' => 'Désactiver le compte',