瀏覽代碼

Mise a jour des routings pour accueilir la langue.

bastien 13 年之前
父節點
當前提交
bcca46f2c9

+ 7 - 0
app/Resources/FOSUserBundle/views/Resetting/checkEmail.html.twig 查看文件

1
+{% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
2
+
3
+{% block fos_user_content %}
4
+<p>
5
+{{ 'resetting.check_email'|trans({'%email%': user.email}, 'FOSUserBundle') }}
6
+</p>
7
+{% endblock %}

+ 5 - 0
app/Resources/FOSUserBundle/views/Resetting/passwordAlreadyRequested.html.twig 查看文件

1
+{% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
2
+
3
+{% block fos_user_content %}
4
+<p>{{ 'resetting.password_already_requested'|trans({}, 'FOSUserBundle') }}</p>
5
+{% endblock fos_user_content %}

+ 5 - 0
app/Resources/FOSUserBundle/views/Resetting/reset.html.twig 查看文件

1
+{% extends "MuzichUserBundle::layout.not_connected.html.twig" %}
2
+
3
+{% block fos_user_content %}
4
+{% include "FOSUserBundle:Resetting:reset_content.html.twig" %}
5
+{% endblock fos_user_content %}

+ 15 - 9
app/config/routing.yml 查看文件

1
-MuzichMynetworkBundle:
2
-    resource: "@MuzichMynetworkBundle/Resources/config/routing.yml"
3
-    prefix:   /
1
+
4
 
2
 
5
 # Internal routing configuration to handle ESI
3
 # Internal routing configuration to handle ESI
6
 #_internal:
4
 #_internal:
7
 #   resource: "@FrameworkBundle/Resources/config/routing/internal.xml"
5
 #   resource: "@FrameworkBundle/Resources/config/routing/internal.xml"
8
 #   prefix:   /_internal
6
 #   prefix:   /_internal
9
-
10
-MuzichCoreBundle:
11
-  resource: "@MuzichCoreBundle/Resources/config/routing.yml"
12
-  prefix: /
13
   
7
   
14
 MuzichIndexBundle:
8
 MuzichIndexBundle:
15
   resource: "@MuzichIndexBundle/Resources/config/routing.yml"
9
   resource: "@MuzichIndexBundle/Resources/config/routing.yml"
16
   prefix: /
10
   prefix: /
11
+  
12
+MuzichCoreBundle:
13
+  resource: "@MuzichCoreBundle/Resources/config/routing.yml"
14
+  prefix: /{_locale}/
15
+  defaults: { _locale: fr }
17
 
16
 
18
 MuzichHomeBundle:
17
 MuzichHomeBundle:
19
   resource: "@MuzichHomeBundle/Resources/config/routing.yml"
18
   resource: "@MuzichHomeBundle/Resources/config/routing.yml"
20
-  prefix: /
19
+  prefix: /{_locale}/
20
+  defaults: { _locale: fr }
21
 
21
 
22
 MuzichUserBundle:
22
 MuzichUserBundle:
23
   resource: "@MuzichUserBundle/Resources/config/routing.yml"
23
   resource: "@MuzichUserBundle/Resources/config/routing.yml"
24
-  prefix: /
24
+  prefix: /{_locale}/
25
+  defaults: { _locale: fr }
26
+
27
+MuzichMynetworkBundle:
28
+  resource: "@MuzichMynetworkBundle/Resources/config/routing.yml"
29
+  prefix:   /{_locale}/
30
+  defaults: { _locale: fr }

+ 2 - 2
src/Muzich/CoreBundle/Resources/config/security.yml 查看文件

28
     ## La en tant qu'exemple, exploiter ça (http://j-place.developpez.com/tutoriels/php/ameliorez-vos-applications-developpees-avec-symfony2/#LVI-A-3)
28
     ## La en tant qu'exemple, exploiter ça (http://j-place.developpez.com/tutoriels/php/ameliorez-vos-applications-developpees-avec-symfony2/#LVI-A-3)
29
     access_control:
29
     access_control:
30
         - { path: ^/hello, roles: IS_AUTHENTICATED_ANONYMOUSLY }
30
         - { path: ^/hello, roles: IS_AUTHENTICATED_ANONYMOUSLY }
31
-        - { path: ^/register, roles: IS_AUTHENTICATED_ANONYMOUSLY }
32
-        - { path: ^/resetting, roles: IS_AUTHENTICATED_ANONYMOUSLY }
31
+        - { path: ^/(?:fr|en)/register, roles: IS_AUTHENTICATED_ANONYMOUSLY }
32
+        - { path: "^/(?:fr|en)/resetting", roles: IS_AUTHENTICATED_ANONYMOUSLY }
33
         
33
         
34
         
34
         
35
         - { path: ^/_wdt/, role: IS_AUTHENTICATED_ANONYMOUSLY }
35
         - { path: ^/_wdt/, role: IS_AUTHENTICATED_ANONYMOUSLY }

+ 8 - 4
src/Muzich/IndexBundle/Resources/config/routing.yml 查看文件

10
 
10
 
11
 fos_user_profile:
11
 fos_user_profile:
12
     resource: "@FOSUserBundle/Resources/config/routing/profile.xml"
12
     resource: "@FOSUserBundle/Resources/config/routing/profile.xml"
13
-    prefix: /profile
13
+    prefix: /{_locale}/profile/
14
+    defaults: { _locale: fr }
14
 
15
 
15
 fos_user_register:
16
 fos_user_register:
16
     resource: "@FOSUserBundle/Resources/config/routing/registration.xml"
17
     resource: "@FOSUserBundle/Resources/config/routing/registration.xml"
17
-    prefix: /register
18
+    prefix: /{_locale}/register/
19
+    defaults: { _locale: fr }
18
 
20
 
19
 fos_user_resetting:
21
 fos_user_resetting:
20
     resource: "@FOSUserBundle/Resources/config/routing/resetting.xml"
22
     resource: "@FOSUserBundle/Resources/config/routing/resetting.xml"
21
-    prefix: /resetting
23
+    prefix: /{_locale}/resetting
24
+    defaults: { _locale: fr }
22
 
25
 
23
 fos_user_change_password:
26
 fos_user_change_password:
24
     resource: "@FOSUserBundle/Resources/config/routing/change_password.xml"
27
     resource: "@FOSUserBundle/Resources/config/routing/change_password.xml"
25
-    prefix: /change-password 
28
+    prefix: /{_locale}/change-password/
29
+    defaults: { _locale: fr }

+ 1 - 1
src/Muzich/UserBundle/Controller/UserController.php 查看文件

53
         $route = 'start';
53
         $route = 'start';
54
       }
54
       }
55
 
55
 
56
-      $this->setFlash('success', 'Votre compte a bien été créé');
56
+      $this->setFlash('fos_user_success', 'registration.flash.user_created');
57
       $url = $this->generateUrl($route);
57
       $url = $this->generateUrl($route);
58
 
58
 
59
       return new RedirectResponse($url);
59
       return new RedirectResponse($url);