Use locale if set

[airbundle] / Resources / config / packages / rapsys_air.yaml

diff --git a/Resources/config/packages/rapsys_air.yaml b/Resources/config/packages/rapsys_air.yaml
index ef9cef958ec8e4c18fe2b6dc139ea06ece037f27..76da2bdecc5d62700f1ea0ab5a34690a17f263c6 100644 (file)
--- a/Resources/config/packages/rapsys_air.yaml
+++ b/Resources/config/packages/rapsys_air.yaml
@@ -1,9 +1,5 @@
 #RapsysAir configuration
 rapsys_air:
 #RapsysAir configuration
 rapsys_air:

-    #Contact
-    contact:
-        name: 'Raphaël Gertz'
-        mail: 'airlibre@rapsys.eu'

 
 #RapsysUser configuration
 rapsys_user:
 
 #RapsysUser configuration
 rapsys_user:


@@ -21,15 +17,40 @@ rapsys_user:
         index:
             name: 'rapsys_air'
     #Translate replacement
         index:
             name: 'rapsys_air'
     #Translate replacement

-    translate: [ 'title', 'site.title', 'copy.by', 'copy.long', 'copy.short' ]
+    translate: [ 'title', 'password', 'site.title', 'copy.by', 'copy.long', 'copy.short', 'copy.title' ]

     #Languages replacement
     languages:
     #Languages replacement
     languages:

-        en: 'English'
-        fr: 'French'
+        en_gb: 'English'
+        fr_fr: 'French'

     #Contact replacement
     contact:
     #Contact replacement
     contact:

-        name: '%rapsys_air.contact.name%'
+        title: '%rapsys_air.contact.title%'

         mail: '%rapsys_air.contact.mail%'
         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:
+            edit: 'Rapsys\AirBundle\Form\RegisterType'
+            name: '@RapsysAir/form/edit.html.twig'
+            context:
+                title: 'Modify account'
+                password: 'Modify password'

     #Login replacement
     login:
         route:
     #Login replacement
     login:
         route:


@@ -38,95 +59,30 @@ rapsys_user:
             name: '@RapsysAir/form/login.html.twig'
             context:
                 title: 'Login'
             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 replacement
     recover:
         route:
             index: 'site.url'

-            recover_mail: 'recover_url'
+            recover: 'recover_url'

         view:
             name: '@RapsysAir/form/recover.html.twig'
             context:
                 title: 'Recover'
         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:
             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:

     #Register replacement
     register:
         route:
             index: 'site.url'
     #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'
         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'
         mail:
             subject: 'Welcome %%recipient_name%% to %%site.title%%'
             html: '@RapsysAir/mail/register.html.twig'


@@ -187,21 +143,34 @@ security:
             #XXX: https://symfony.com/doc/current/security/form_login_setup.html
             #TODO: https://symfony.com/doc/current/security/guard_authentication.html
             form_login:
             #XXX: https://symfony.com/doc/current/security/form_login_setup.html
             #TODO: https://symfony.com/doc/current/security/guard_authentication.html
             form_login:

+                #Redirect to referer if different from login route

                 use_referer: true
                 use_referer: true

+                #Login path

                 login_path: rapsys_user_login
                 login_path: rapsys_user_login

+                #Check path

                 check_path: rapsys_user_login
                 check_path: rapsys_user_login

+                #Username parameter

                 username_parameter: 'login[mail]'
                 username_parameter: 'login[mail]'

+                #Password parameter

                 password_parameter: 'login[password]'
 
             #Set logout route
             logout:
                 password_parameter: 'login[password]'
 
             #Set logout route
             logout:

+                #Logout route

                 path: rapsys_user_logout
                 path: rapsys_user_logout

-                #XXX: see https://symfony.com/doc/current/security.html#logging-out
-                success_handler: Rapsys\AirBundle\Security\LogoutSuccessHandler
-                #target: /
+                #Logout default target
+                target: rapsys_air

 
             #Set custom access denied handler
 
             #Set custom access denied handler

-            access_denied_handler: Rapsys\AirBundle\Security\AccessDeniedHandler
+            access_denied_handler: Rapsys\AirBundle\Handler\AccessDeniedHandler
+
+            #Remember me
+            #XXX: see https://symfony.com/doc/current/security/remember_me.html
+            remember_me:
+                #Use APP_SECRET
+                secret: '%kernel.secret%'
+                #Always remember me
+                always_remember_me: true

 
     #Set role hierarchy
     role_hierarchy:
 
     #Set role hierarchy
     role_hierarchy:


@@ -212,16 +181,17 @@ security:
 
 #Framework configuration
 framework:
 
 #Framework configuration
 framework:

-    default_locale: 'fr'
+    default_locale: 'fr_fr'

     #error_controller: 'Rapsys\AirBundle\Controller\ErrorController::show'
     translator:
     #error_controller: 'Rapsys\AirBundle\Controller\ErrorController::show'
     translator:

-        fallbacks: [ 'fr', 'en' ]
+        fallbacks: [ 'fr_fr', 'en_gb' ]

     session:
         enabled: true
         handler_id: ~
         cookie_secure: 'auto'
         cookie_samesite: 'lax'
     disallow_search_engine_index: false
     session:
         enabled: true
         handler_id: ~
         cookie_secure: 'auto'
         cookie_samesite: 'lax'
     disallow_search_engine_index: false

+    secret: '%env(APP_SECRET)%'

 #framework:
 #    error_controller: Rapsys\AirBundle\Controller\ErrorController::show
 #
 #framework:
 #    error_controller: Rapsys\AirBundle\Controller\ErrorController::show
 #


@@ -279,53 +249,51 @@ services:
     #    tags: [ 'twig.extension' ]
     #Register application controller
     Rapsys\AirBundle\Controller\ApplicationController:
     #    tags: [ 'twig.extension' ]
     #Register application controller
     Rapsys\AirBundle\Controller\ApplicationController:

-        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        arguments: [ '@service_container', '@router', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register calendar controller
     Rapsys\AirBundle\Controller\CalendarController:
         tags: [ 'controller.service_arguments' ]
     #Register calendar controller
     Rapsys\AirBundle\Controller\CalendarController:

-        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        arguments: [ '@service_container', '@router', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register default controller
     Rapsys\AirBundle\Controller\DefaultController:
         tags: [ 'controller.service_arguments' ]
     #Register default controller
     Rapsys\AirBundle\Controller\DefaultController:

-        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        arguments: [ '@service_container', '@router', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register location controller
     Rapsys\AirBundle\Controller\LocationController:
         tags: [ 'controller.service_arguments' ]
     #Register location controller
     Rapsys\AirBundle\Controller\LocationController:

-        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        arguments: [ '@service_container', '@router', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register user controller
     Rapsys\AirBundle\Controller\UserController:
         tags: [ 'controller.service_arguments' ]
     #Register user controller
     Rapsys\AirBundle\Controller\UserController:

-        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        arguments: [ '@service_container', '@router', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register session controller
     Rapsys\AirBundle\Controller\SessionController:
         tags: [ 'controller.service_arguments' ]
     #Register session controller
     Rapsys\AirBundle\Controller\SessionController:

-        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        arguments: [ '@service_container', '@router', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register snippet controller
     Rapsys\AirBundle\Controller\SnippetController:
         tags: [ 'controller.service_arguments' ]
     #Register snippet controller
     Rapsys\AirBundle\Controller\SnippetController:

-        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        arguments: [ '@service_container', '@router', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register error controller
     Rapsys\AirBundle\Controller\ErrorController:
         tags: [ 'controller.service_arguments' ]
     #Register error controller
     Rapsys\AirBundle\Controller\ErrorController:

-        arguments: [ '@service_container', '@router', '@request_stack', '@translator' ]
+        arguments: [ '@service_container', '@router', '@translator' ]

         tags: [ 'controller.service_arguments' ]
     #Register locale event subscriber
         tags: [ 'controller.service_arguments' ]
     #Register locale event subscriber

-    Rapsys\AirBundle\EventSubscriber\LocaleSubscriber:
+    #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
         arguments: [ '@router', '%rapsys_air.locales%' ]
         tags: [ 'kernel.event_subscriber' ]
     #Register access denied handler

-    Rapsys\AirBundle\Security\AccessDeniedHandler:
+    Rapsys\AirBundle\Handler\AccessDeniedHandler:

         arguments: [ '@service_container', '@twig', '@router', '@request_stack', '@translator' ]
         arguments: [ '@service_container', '@twig', '@router', '@request_stack', '@translator' ]

-    #Register logout success handler
-    Rapsys\AirBundle\Security\LogoutSuccessHandler:
-        arguments: [ '@router' ]

     #Register air fixtures
     Rapsys\AirBundle\DataFixtures\AirFixtures:
         tags: [ 'doctrine.fixture.orm' ]
     #Register air fixtures
     Rapsys\AirBundle\DataFixtures\AirFixtures:
         tags: [ 'doctrine.fixture.orm' ]

-    #Replace assets packages
-    assets.packages:
-        class: 'Symfony\Component\Asset\Packages'
-        arguments: [ '@rapsys_pack.path_package' ]

 #   #Set version strategy
 #   assets.static_version_strategy:
 #       class: Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy
 #   #Set version strategy
 #   assets.static_version_strategy:
 #       class: Symfony\Component\Asset\VersionStrategy\StaticVersionStrategy


@@ -347,6 +315,9 @@ services:
     Rapsys\AirBundle\Command\CalendarCommand:
         arguments: [ '@service_container', '@doctrine', '@router', '@translator' ]
         tags: [ 'console.command' ]
     Rapsys\AirBundle\Command\CalendarCommand:
         arguments: [ '@service_container', '@doctrine', '@router', '@translator' ]
         tags: [ 'console.command' ]

+    Rapsys\AirBundle\Command\RekeyCommand:
+        arguments: [ '@doctrine' ]
+        tags: [ 'console.command' ]

     Rapsys\AirBundle\Command\WeatherCommand:
         arguments: [ '@doctrine' ]
         tags: [ 'console.command' ]
     Rapsys\AirBundle\Command\WeatherCommand:
         arguments: [ '@doctrine' ]
         tags: [ 'console.command' ]


@@ -356,6 +327,8 @@ twig:
     #Enforce debug
     #debug: true
     #auto_reload: ~
     #Enforce debug
     #debug: true
     #auto_reload: ~

+    #Disable cache
+    #XXX: enable forced regeneration of css and js at each page load

     cache: false
     #Fix form layout for css
     #XXX: @RapsysAir is a shortcut to vendor/rapsys/airbundle/Resources/views directory here
     cache: false
     #Fix form layout for css
     #XXX: @RapsysAir is a shortcut to vendor/rapsys/airbundle/Resources/views directory here