Skip to content

Commit 0c2fe1b

Browse files
Fixes for FOSUserBundle locale routing
1 parent dd43dfa commit 0c2fe1b

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

app/Resources/views/nav_bootstrap.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<span class="icon-bar"></span>
1010
<span class="icon-bar"></span>
1111
</button>
12-
<a class="navbar-brand" href="/">{{ 'project_name'|trans }}</a>
12+
<a class="navbar-brand" href="{{ path('homepage') }}">{{ 'project_name'|trans }}</a>
1313
</div>
1414
<div id="navbar" class="navbar-collapse collapse">
1515
<ul class="nav navbar-nav">

app/Resources/views/nav_materialize.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<nav class="nav-extended">
33
    <div class="nav-wrapper">
44
<div>
5-
<a href="/">{{ 'project_name'|trans }}</a>
5+
<a href="{{ path('homepage') }}">{{ 'project_name'|trans }}</a>
66
</div>
77
<div id="navbar">
88
<ul>
@@ -25,7 +25,7 @@
2525
</li>
2626
{% else %}
2727
<li><a href="{{ path('fos_user_security_login') }}">{{ 'action.sign_in'|trans }}</a></li>
28-
<li><a href="/register">{{ 'action.sign_up'|trans }}</a></li>
28+
<li><a href="{{ path('fos_user_registration_register') }}">{{ 'action.sign_up'|trans }}</a></li>
2929
{% endif %}
3030
{% if is_granted("ROLE_ADMIN") %}
3131
<li>

app/Resources/views/nav_skeleton.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<nav>
33
    <div>
44
<div>
5-
<a href="/">{{ 'project_name'|trans }}</a>
5+
<a href="{{ path('homepage') }}">{{ 'project_name'|trans }}</a>
66
</div>
77
<div id="navbar">
88
<ul>
@@ -25,7 +25,7 @@
2525
</li>
2626
{% else %}
2727
<li><a href="{{ path('fos_user_security_login') }}">{{ 'action.sign_in'|trans }}</a></li>
28-
<li><a href="/register">{{ 'action.sign_up'|trans }}</a></li>
28+
<li><a href="{{ path('fos_user_registration_register') }}">{{ 'action.sign_up'|trans }}</a></li>
2929
{% endif %}
3030
{% if is_granted("ROLE_ADMIN") %}
3131
<li>

src/ApiBundle/Resources/config/routing.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,23 @@ homepage:
2828

2929
fos_user_security:
3030
resource: "@FOSUserBundle/Resources/config/routing/security.xml"
31+
prefix: /{_locale}
3132

3233
fos_user_resetting:
3334
resource: "@FOSUserBundle/Resources/config/routing/resetting.xml"
34-
prefix: /resetting
35+
prefix: /{_locale}/resetting
3536

3637
fos_user_profile:
3738
resource: "@FOSUserBundle/Resources/config/routing/profile.xml"
38-
prefix: /profile
39+
prefix: /{_locale}/profile
3940

4041
fos_user_register:
4142
resource: "@FOSUserBundle/Resources/config/routing/registration.xml"
42-
prefix: /register
43+
prefix: /{_locale}/register
4344

4445
fos_user_change_password:
4546
resource: "@FOSUserBundle/Resources/config/routing/change_password.xml"
46-
prefix: /profile
47+
prefix: /{_locale}/profile
4748

4849
users:
4950
resource: "@ApiBundle/Resources/config/user_routes.yml"

0 commit comments

Comments
 (0)