From 02097eb50dfcb7cee732c828401f82962b7fcb60 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Sun, 8 Aug 2021 20:03:18 +0200 Subject: [PATCH] Remove contact.title from translated keys Move context specific keys in global context Remove recover_mail entry Add edit entry Rename locale to underscored one Cleanup controller constructor Remove assets.packages replacement was moved to Rapsys\PackBundle now Add FacebookSubscriber changing page locale with valid fb_locale provided --- Resources/config/packages/rapsys_air.yaml | 141 +++++++++------------- 1 file changed, 57 insertions(+), 84 deletions(-) diff --git a/Resources/config/packages/rapsys_air.yaml b/Resources/config/packages/rapsys_air.yaml index 57f3b70..283651f 100644 --- a/Resources/config/packages/rapsys_air.yaml +++ b/Resources/config/packages/rapsys_air.yaml @@ -17,15 +17,39 @@ rapsys_user: index: name: 'rapsys_air' #Translate replacement - translate: [ 'title', 'site.title', 'contact.title', 'copy.by', 'copy.long', 'copy.short' ] + translate: [ 'title', 'site.title', 'copy.by', 'copy.long', 'copy.short', 'copy.title' ] #Languages replacement languages: - en-gb: 'English' - fr-fr: 'French' + en_gb: 'English' + fr_fr: 'French' #Contact replacement contact: title: '%rapsys_air.contact.title%' mail: '%rapsys_air.contact.mail%' + #Context replacement + context: + copy: + by: '%rapsys_air.copy.by%' + link: '%rapsys_air.copy.link%' + long: '%rapsys_air.copy.long%' + short: '%rapsys_air.copy.short%' + title: '%rapsys_air.copy.title%' + site: + ico: '%rapsys_air.site.ico%' + logo: '%rapsys_air.site.logo%' + png: '%rapsys_air.site.png%' + svg: '%rapsys_air.site.svg%' + title: '%rapsys_air.site.title%' + url: '%rapsys_air.site.url%' + #Edit replacement + edit: + route: + index: 'site.url' + view: + form: 'Rapsys\AirBundle\Form\RegisterType' + name: '@RapsysAir/form/register.html.twig' + context: + title: 'Modify' #Login replacement login: route: @@ -34,95 +58,44 @@ rapsys_user: name: '@RapsysAir/form/login.html.twig' context: title: 'Login' - copy: - by: '%rapsys_air.copy.by%' - link: '%rapsys_air.copy.link%' - long: '%rapsys_air.copy.long%' - short: '%rapsys_air.copy.short%' - title: '%rapsys_air.copy.title%' - site: - ico: '%rapsys_air.site.ico%' - logo: '%rapsys_air.site.logo%' - png: '%rapsys_air.site.png%' - svg: '%rapsys_air.site.svg%' - title: '%rapsys_air.site.title%' - url: '%rapsys_air.site.url%' #Recover replacement recover: route: index: 'site.url' - recover_mail: 'recover_url' + recover: 'recover_url' view: name: '@RapsysAir/form/recover.html.twig' context: title: 'Recover' - copy: - by: '%rapsys_air.copy.by%' - link: '%rapsys_air.copy.link%' - long: '%rapsys_air.copy.long%' - short: '%rapsys_air.copy.short%' - title: '%rapsys_air.copy.title%' - site: - ico: '%rapsys_air.site.ico%' - logo: '%rapsys_air.site.logo%' - png: '%rapsys_air.site.png%' - svg: '%rapsys_air.site.svg%' - title: '%rapsys_air.site.title%' - url: '%rapsys_air.site.url%' mail: subject: 'Welcome back %%recipient_name%% to %%site.title%%' html: '@RapsysAir/mail/recover.html.twig' text: '@RapsysAir/mail/recover.text.twig' context: - #Mail recover replacement - recover_mail: - route: - index: 'site.url' - recover_mail: 'recover_url' - view: - name: '@RapsysAir/form/recover_mail.html.twig' - context: - title: 'Mail recover' - copy: - by: '%rapsys_air.copy.by%' - link: '%rapsys_air.copy.link%' - long: '%rapsys_air.copy.long%' - short: '%rapsys_air.copy.short%' - title: '%rapsys_air.copy.title%' - site: - ico: '%rapsys_air.site.ico%' - logo: '%rapsys_air.site.logo%' - png: '%rapsys_air.site.png%' - svg: '%rapsys_air.site.svg%' - title: '%rapsys_air.site.title%' - url: '%rapsys_air.site.url%' - mail: - subject: 'Welcome back %%recipient_name%% to %%site.title%%' - html: '@RapsysAir/mail/recover_mail.html.twig' - text: '@RapsysAir/mail/recover_mail.text.twig' - context: + #Recover mail replacement + #recover_mail: + # route: + # index: 'site.url' + # recover_mail: 'recover_url' + # view: + # name: '@RapsysAir/form/recover_mail.html.twig' + # context: + # title: 'Mail recover' + # mail: + # subject: 'Welcome back %%recipient_name%% to %%site.title%%' + # html: '@RapsysAir/mail/recover_mail.html.twig' + # text: '@RapsysAir/mail/recover_mail.text.twig' + # context: #Register replacement register: route: index: 'site.url' + confirm: 'confirm_url' view: form: 'Rapsys\AirBundle\Form\RegisterType' name: '@RapsysAir/form/register.html.twig' context: title: 'Register' - copy: - by: '%rapsys_air.copy.by%' - link: '%rapsys_air.copy.link%' - long: '%rapsys_air.copy.long%' - short: '%rapsys_air.copy.short%' - title: '%rapsys_air.copy.title%' - site: - ico: '%rapsys_air.site.ico%' - logo: '%rapsys_air.site.logo%' - png: '%rapsys_air.site.png%' - svg: '%rapsys_air.site.svg%' - title: '%rapsys_air.site.title%' - url: '%rapsys_air.site.url%' mail: subject: 'Welcome %%recipient_name%% to %%site.title%%' html: '@RapsysAir/mail/register.html.twig' @@ -208,10 +181,10 @@ security: #Framework configuration framework: - default_locale: 'fr-fr' + default_locale: 'fr_fr' #error_controller: 'Rapsys\AirBundle\Controller\ErrorController::show' translator: - fallbacks: [ 'fr-fr', 'en-gb' ] + fallbacks: [ 'fr_fr', 'en_gb' ] session: enabled: true handler_id: ~ @@ -273,47 +246,47 @@ services: # class: 'Rapsys\PackBundle\Twig\PackExtension' # arguments: [ '@file_locator', '@service_container', '@rapsys_pack.path_package' ] # tags: [ 'twig.extension' ] - #Replace assets packages - assets.packages: - class: 'Symfony\Component\Asset\Packages' - arguments: [ '@rapsys_pack.path_package' ] #Register application controller Rapsys\AirBundle\Controller\ApplicationController: - arguments: [ '@service_container', '@router', '@request_stack', '@translator', '@assets.packages' ] + arguments: [ '@service_container', '@router', '@translator' ] tags: [ 'controller.service_arguments' ] #Register calendar controller Rapsys\AirBundle\Controller\CalendarController: - arguments: [ '@service_container', '@router', '@request_stack', '@translator', '@assets.packages' ] + arguments: [ '@service_container', '@router', '@translator' ] tags: [ 'controller.service_arguments' ] #Register default controller Rapsys\AirBundle\Controller\DefaultController: - arguments: [ '@service_container', '@router', '@request_stack', '@translator', '@assets.packages' ] + arguments: [ '@service_container', '@router', '@translator' ] tags: [ 'controller.service_arguments' ] #Register location controller Rapsys\AirBundle\Controller\LocationController: - arguments: [ '@service_container', '@router', '@request_stack', '@translator', '@assets.packages' ] + arguments: [ '@service_container', '@router', '@translator' ] tags: [ 'controller.service_arguments' ] #Register user controller Rapsys\AirBundle\Controller\UserController: - arguments: [ '@service_container', '@router', '@request_stack', '@translator', '@assets.packages' ] + arguments: [ '@service_container', '@router', '@translator' ] tags: [ 'controller.service_arguments' ] #Register session controller Rapsys\AirBundle\Controller\SessionController: - arguments: [ '@service_container', '@router', '@request_stack', '@translator', '@assets.packages' ] + arguments: [ '@service_container', '@router', '@translator' ] tags: [ 'controller.service_arguments' ] #Register snippet controller Rapsys\AirBundle\Controller\SnippetController: - arguments: [ '@service_container', '@router', '@request_stack', '@translator', '@assets.packages' ] + arguments: [ '@service_container', '@router', '@translator' ] tags: [ 'controller.service_arguments' ] #Register error controller Rapsys\AirBundle\Controller\ErrorController: - arguments: [ '@service_container', '@router', '@request_stack', '@translator', '@assets.packages' ] + arguments: [ '@service_container', '@router', '@translator' ] tags: [ 'controller.service_arguments' ] #Register locale event subscriber #TODO: remove that shit now ??? #Rapsys\AirBundle\EventSubscriber\LocaleSubscriber: # arguments: [ '@router', '%rapsys_air.locales%' ] # tags: [ 'kernel.event_subscriber' ] + #Register facebook event subscriber + Rapsys\AirBundle\EventSubscriber\FacebookSubscriber: + arguments: [ '@router', '%rapsys_air.locales%' ] + tags: [ 'kernel.event_subscriber' ] #Register access denied handler Rapsys\AirBundle\Security\AccessDeniedHandler: arguments: [ '@service_container', '@twig', '@router', '@request_stack', '@translator' ] -- 2.41.0