Readd languages and locale in default key

[userbundle] / Resources / config / routes / rapsys_user.yaml

diff --git a/Resources/config/routes/rapsys_user.yaml b/Resources/config/routes/rapsys_user.yaml
index 3fbe262df21dd523e73b9f8990db818c9c5408c5..fed2abde69a1893c4cfec3c3bbc48b417957bfe1 100644 (file)
--- a/Resources/config/routes/rapsys_user.yaml
+++ b/Resources/config/routes/rapsys_user.yaml
@@ -1,51 +1,53 @@
 rapsys_user_confirm:
 rapsys_user_confirm:

-    path: /confirm/{mail}/{hash}
-    controller: Rapsys\UserBundle\Controller\DefaultController::registerMail
+    path: /confirm/{hash}/{mail}
+    controller: Rapsys\UserBundle\Controller\UserController::registerMail

     requirements:
     requirements:

-        mail: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
     methods: GET|POST
 

-rapsys_user_login:
-    path: /login
-    controller: Rapsys\UserBundle\Controller\DefaultController::login
+rapsys_user_edit:
+    path: /user/{hash}/{mail}
+    controller: Rapsys\UserBundle\Controller\UserController::edit
+    requirements:
+        hash: '[a-zA-Z0-9=_-]+'
+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
     methods: GET|POST
 

-rapsys_user_logout:
-    path: /logout
+rapsys_user_index:
+    path: /
+    controller: Rapsys\UserBundle\Controller\UserController::index

     methods: GET
 
     methods: GET
 

-rapsys_user_recover:
-    path: /recover/{mail}/pass/{hash}
-    controller: Rapsys\UserBundle\Controller\DefaultController::recover
+rapsys_user_login:
+    path: /login/{hash}/{mail}
+    controller: Rapsys\UserBundle\Controller\UserController::login

     defaults:
     defaults:

-        mail: ~
-        pass: ~

         hash: ~
         hash: ~

+        mail: ~

     requirements:
     requirements:

-        mail: '[a-zA-Z0-9=_-]+'
-        pass: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

+        mail: '[a-zA-Z0-9=_-]+'

     methods: GET|POST
 
     methods: GET|POST
 

-rapsys_user_register:
-    path: /register/{fields}/{hash}
-    controller: Rapsys\UserBundle\Controller\DefaultController::register
+rapsys_user_logout:
+    path: /logout
+    methods: GET
+
+rapsys_user_recover:
+    path: /recover/{hash}/{pass}/{mail}
+    controller: Rapsys\UserBundle\Controller\UserController::recover

     defaults:
     defaults:

-        fields: ~

         hash: ~
         hash: ~

+        pass: ~
+        mail: ~

     requirements:
     requirements:

-        fields: '[a-zA-Z0-9=_-]+'

         hash: '[a-zA-Z0-9=_-]+'
         hash: '[a-zA-Z0-9=_-]+'

-    methods: GET|POST
-
-rapsys_user_edit:
-    path: /user/{mail}
-    controller: Rapsys\UserBundle\Controller\DefaultController::edit
-    requirements:
+        pass: '[a-zA-Z0-9=_-]+'

         mail: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 
         mail: '[a-zA-Z0-9=_-]+'
     methods: GET|POST
 

-rapsys_user_index:
-    path: /
-    methods: GET
+rapsys_user_register:
+    path: /register
+    controller: Rapsys\UserBundle\Controller\UserController::register
+    methods: GET|POST