From 2087e499b4493c7b69032bbef8b7debfdd8cd45c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sun, 30 Oct 2016 12:11:24 +0100 Subject: Translation update - French --- .../UserBundle/Resources/translations/wallabag_user.fr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml index 30ab5dd9..fbc95a05 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml @@ -1,11 +1,11 @@ # Two factor mail auth_code: - on: 'sur' + on: "sur" mailer: - subject: "Code d'authentification wallabag" + subject: "Code d’authentification wallabag" body: hello: "Bonjour %user%," first_para: "Comme vous avez activé la double authentification sur votre compte wallabag et que vous venez de vous connecter depuis un nouvel appareil (ordinateur, téléphone, etc.), nous vous envoyons un code pour valider votre connexion." second_para: "Voici le code à renseigner :" - support: "Si vous avez un problème de connexion, n'hésitez pas à contacter le support :" - signature: "L'équipe wallabag" + support: "Si vous avez un problème de connexion, n’hésitez pas à contacter le support :" + signature: "L’équipe wallabag" -- cgit v1.2.3 From 4b3c983ab85af2ab09540c4849a9e65843a7ab67 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 30 Oct 2016 20:27:41 +0100 Subject: Inject parameter instead of service We are injecting CraueConfig service when we only need to retrieve one or two values from it. Instead I discovered we can directly inject a value from a service in the service definition! --- src/Wallabag/UserBundle/Resources/config/services.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index eb9c8e67..a8ee721b 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml @@ -6,7 +6,8 @@ services: - "@twig" - "%scheb_two_factor.email.sender_email%" - "%scheb_two_factor.email.sender_name%" - - "@craue_config" + - '@=service(''craue_config'').get(''wallabag_support_url'')' + - '@=service(''craue_config'').get(''wallabag_url'')' wallabag_user.password_resetting: class: Wallabag\UserBundle\EventListener\PasswordResettingListener -- cgit v1.2.3