diff --git a/core/EventSuscriber/Account/PasswordRequestEventSubscriber.php b/core/EventSuscriber/Account/PasswordRequestEventSubscriber.php
index 70e0c47..909cb22 100644
--- a/core/EventSuscriber/Account/PasswordRequestEventSubscriber.php
+++ b/core/EventSuscriber/Account/PasswordRequestEventSubscriber.php
@@ -53,7 +53,7 @@ class PasswordRequestEventSubscriber implements EventSubscriberInterface
$this->entityManager->update($user);
$this->notifier
- ->setSubject($translator->trans('Mot de passe perdu'))
+ ->setSubject($this->translator->trans('Mot de passe perdu'))
->addRecipient($user->getEmail())
->notify('@Core/mail/account/resetting_request.html.twig', [
'reseting_update_link' => $this->urlGenerator->generate(
diff --git a/core/EventSuscriber/Site/NodeEventSubscriber.php b/core/EventSuscriber/Site/NodeEventSubscriber.php
index cd1e252..39128d5 100644
--- a/core/EventSuscriber/Site/NodeEventSubscriber.php
+++ b/core/EventSuscriber/Site/NodeEventSubscriber.php
@@ -83,11 +83,13 @@ class NodeEventSubscriber extends EntityManagerEventSubscriber
}
$parameters = $node->getParameters();
+ $routeParameters = [];
foreach ($parameters as $key => $parameter) {
$parameter['name'] = $this->routeParameterSlugify->slugify($parameter['name']);
$routeParameter = sprintf('{%s}', $parameter['name']);
$regex = '/'.preg_quote($routeParameter).'/';
+ $routeParameters[] = $parameter['name'];
if (!preg_match($regex, $generatedUrl)) {
$generatedUrl .= '/'.$routeParameter;
@@ -96,6 +98,20 @@ class NodeEventSubscriber extends EntityManagerEventSubscriber
$parameters[$key] = $parameter;
}
+ preg_match_all('/\{(.*)\}/isU', $generatedUrl, $matches, PREG_SET_ORDER);
+
+ foreach ($matches as $match) {
+ if (!in_array($match[1], $routeParameters)) {
+ $parameters[] = [
+ 'name' => $this->routeParameterSlugify->slugify($match[1]),
+ 'defaultValue' => null,
+ 'requirement' => null,
+ ];
+ }
+ }
+
+ $generatedUrl = str_replace('//', '/', $generatedUrl);
+
$node->setParameters($parameters);
$attributes = $node->getAttributes();
diff --git a/core/Resources/translations/messages.fr.yaml b/core/Resources/translations/messages.fr.yaml
index c3de162..74a7db0 100644
--- a/core/Resources/translations/messages.fr.yaml
+++ b/core/Resources/translations/messages.fr.yaml
@@ -67,7 +67,7 @@
"New parameter": "Nouveau paramètre"
"New attribut": "Nouveau attribut"
"New menu": "Nouveau menu"
-"New": "Nouveau menu"
+"New": "Nouveau"
"No action": "Aucune action"
"Route name: %routeName%
": "Nom de la route : %routeName%
"
"Content": "Contenu"
diff --git a/core/Resources/views/site/tree_admin/navigation.html.twig b/core/Resources/views/site/tree_admin/navigation.html.twig
index f4ce512..f302a11 100644
--- a/core/Resources/views/site/tree_admin/navigation.html.twig
+++ b/core/Resources/views/site/tree_admin/navigation.html.twig
@@ -115,8 +115,6 @@
{% if node.hasExternalUrl %}
-
- {{ node.url }}
{% else %}
{% if node.parameters|length %}