From 3d10d3501676aad377f91aa03155b176a1fdf270 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 14 Oct 2025 13:10:27 +0200 Subject: [PATCH 01/16] Readd short locale alternate link when missing --- Controller/AbstractController.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php index 2efdd34..57a0ffc 100644 --- a/Controller/AbstractController.php +++ b/Controller/AbstractController.php @@ -393,6 +393,27 @@ abstract class AbstractController extends BaseAbstractController implements Serv //Set locale locales context $parameters['alternates'][$shortCurrent] = $parameters['alternates'][str_replace('_', '-', $locale)]; } + //Add shorter locale + } elseif (empty($parameters['alternates'][$shortCurrent = substr($locale, 0, 2)])) { + //Set titles + $titles = []; + + //Set route params locale + $routeParams['_locale'] = $locale; + + //Iterate on other locales + foreach(array_diff($this->config['locales'], [$locale]) as $other) { + //Set other locale title + $titles[$other] = $this->translator->trans($this->config['languages'][$locale], [], null, $other); + } + + //Set locale locales context + $parameters['alternates'][$shortCurrent] = [ + 'absolute' => $this->router->generate($this->route, $routeParams, UrlGeneratorInterface::ABSOLUTE_URL), + 'relative' => $this->router->generate($this->route, $routeParams), + 'title' => implode('/', $titles), + 'translated' => $this->translator->trans($this->config['languages'][$locale], [], null, $locale) + ]; } } } -- 2.41.3 From 32a7467601fe8e83c0c31940f298388c8bdc4bda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 14 Oct 2025 13:11:11 +0200 Subject: [PATCH 02/16] New context layout Edit form name was renamed as register --- templates/form/edit.html.twig | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/form/edit.html.twig b/templates/form/edit.html.twig index ef321a6..5d6aa4a 100644 --- a/templates/form/edit.html.twig +++ b/templates/form/edit.html.twig @@ -2,7 +2,7 @@ {% block content %}
-

{{ title }}

+

{{ title.page }}

{% if disabled is defined and disabled %} @@ -11,55 +11,55 @@

{% trans %}Your verification mail has been sent, to activate your account follow the confirmation link inside{% endtrans %}

{% trans %}If you did not receive a verification mail, check your Spam or Junk mail folder{% endtrans %}

{% else %} - {{ form_start(edit) }} - {% if edit.mail is defined %} - {{ form_row(edit.mail) }} + {{ form_start(register) }} + {% if register.mail is defined %} + {{ form_row(register.mail) }} {% endif %} - {% if edit.password is defined %} - {{ form_row(edit.password) }} + {% if register.password is defined %} + {{ form_row(register.password) }} {% endif %} - {% if edit.civility is defined %} - {{ form_row(edit.civility) }} + {% if register.civility is defined %} + {{ form_row(register.civility) }} {% endif %} - {% if edit.forename is defined %} - {{ form_row(edit.forename) }} + {% if register.forename is defined %} + {{ form_row(register.forename) }} {% endif %} - {% if edit.surname is defined %} - {{ form_row(edit.surname) }} + {% if register.surname is defined %} + {{ form_row(register.surname) }} {% endif %} - {% if edit.pseudonym is defined %} - {{ form_row(edit.pseudonym) }} + {% if register.pseudonym is defined %} + {{ form_row(register.pseudonym) }} {% endif %} - {% if edit.slug is defined %} - {{ form_row(edit.slug) }} + {% if register.slug is defined %} + {{ form_row(register.slug) }} {% endif %} - {% if edit.active is defined %} - {{ form_row(edit.active) }} + {% if register.active is defined %} + {{ form_row(register.active) }} {% endif %} - {% if edit.enable is defined %} - {{ form_row(edit.enable) }} + {% if register.enable is defined %} + {{ form_row(register.enable) }} {% endif %} - {{ form_row(edit.submit) }} + {{ form_row(register.submit) }} {# Render CSRF token etc .#} -
{{ form_rest(edit) }}
- {{ form_end(edit) }} +
{{ form_rest(register) }}
+ {{ form_end(register) }} {% endif %}
{% if reset is defined %}
-

{{ password }}

+

{{ password }}

{{ form_start(reset) }} -- 2.41.3 From 635630015b5ef3cb392955f7dffdc19d689ba29b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 14 Oct 2025 13:22:54 +0200 Subject: [PATCH 03/16] Restore root default route --- Controller/AbstractController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php index 57a0ffc..fca2be9 100644 --- a/Controller/AbstractController.php +++ b/Controller/AbstractController.php @@ -337,7 +337,7 @@ abstract class AbstractController extends BaseAbstractController implements Serv 'logo' => $this->config['logo'], 'next' => null, 'prev' => null, - 'root' => $this->router->generate($this->config['root']), + 'root' => $this->config['root'], 'title' => [ 'page' => null, 'section' => null, -- 2.41.3 From e6beb4f4df2c233d856a4f119c3f40e90bf06e44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 14 Oct 2025 13:23:17 +0200 Subject: [PATCH 04/16] Generate root path --- templates/_base.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/_base.html.twig b/templates/_base.html.twig index 0b103c0..a175f5d 100644 --- a/templates/_base.html.twig +++ b/templates/_base.html.twig @@ -69,7 +69,7 @@
- {% if sent is defined and sent %} -

{% trans %}Your message has been sent{% endtrans %}

- {% else %} - {{ form_start(contact) }} - {{ form_row(contact.subject) }} + {{ form_start(contact) }} + {{ form_row(contact.subject) }} - {{ form_row(contact.name) }} + {{ form_row(contact.name) }} - {{ form_row(contact.mail) }} + {{ form_row(contact.mail) }} - {{ form_row(contact.message) }} + {{ form_row(contact.message) }} - {{ form_row(contact.captcha) }} + {{ form_row(contact.captcha) }} - {{ form_row(contact.submit) }} + {{ form_row(contact.submit) }} - {# Render CSRF token etc .#} -
{{ form_rest(contact) }}
- {{ form_end(contact) }} - {% endif %} + {# Render CSRF token etc .#} +
{{ form_rest(contact) }}
+ {{ form_end(contact) }}
{% endblock %} -- 2.41.3 From 7b609d9a52819796b6e25c8eb374d989beef66bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 14 Oct 2025 17:07:49 +0200 Subject: [PATCH 15/16] Remove sent parameter replaced by a notice --- templates/form/recover.html.twig | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/templates/form/recover.html.twig b/templates/form/recover.html.twig index 2b18e69..46a4503 100644 --- a/templates/form/recover.html.twig +++ b/templates/form/recover.html.twig @@ -2,27 +2,23 @@ {% block content %}
-

{{ title }}

+

{{ title.page }}

- {% if sent %} -

{% trans %}Your account recovery message has been sent{% endtrans %}

- {% else %} - {{ form_start(recover) }} - {% if recover.mail is defined %} - {{ form_row(recover.mail) }} - {% endif %} + {{ form_start(recover) }} + {% if recover.mail is defined %} + {{ form_row(recover.mail) }} + {% endif %} - {% if recover.password is defined %} - {{ form_row(recover.password) }} - {% endif %} + {% if recover.password is defined %} + {{ form_row(recover.password) }} + {% endif %} - {{ form_row(recover.submit) }} + {{ form_row(recover.submit) }} - {# Render CSRF token etc .#} -
{{ form_rest(recover) }}
- {{ form_end(recover) }} - {% endif %} + {# Render CSRF token etc .#} +
{{ form_rest(recover) }}
+ {{ form_end(recover) }}
{% endblock %} -- 2.41.3 From d4c245278d35fdcc266b9ba9edee4f02c885df15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Tue, 14 Oct 2025 17:08:09 +0200 Subject: [PATCH 16/16] New context layout --- templates/form/register.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/form/register.html.twig b/templates/form/register.html.twig index ac89ff2..11c3b9e 100644 --- a/templates/form/register.html.twig +++ b/templates/form/register.html.twig @@ -2,7 +2,7 @@ {% block content %}
-

{{ title }}

+

{{ title.page }}

{% if disabled is defined and disabled %} -- 2.41.3