From be417ef23685e17a239b1d192a0e9b9f484f1bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 12 Jun 2017 17:23:35 +0200
Subject: Added possibility to change locale from login/register pages

---
 src/Wallabag/UserBundle/Resources/views/layout.html.twig | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/Wallabag/UserBundle/Resources/views/layout.html.twig')

diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
index 99bf7dfd..6934c686 100644
--- a/src/Wallabag/UserBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
@@ -15,6 +15,11 @@
             {% block fos_user_content %}
             {% endblock fos_user_content %}
         </div>
+        <div class="center">
+            <a href="{{ path('changeLocale', {'language': 'de'}) }}">Deutsch</a>
+            <a href="{{ path('changeLocale', {'language': 'en'}) }}">English</a>
+            <a href="{{ path('changeLocale', {'language': 'fr'}) }}">Français</a>
+        </div>
     </div>
 </main>
 {% endblock %}
-- 
cgit v1.2.3


From 4d4147b228ac90f329fd2d40dd4fb60cb980328a Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 13 Oct 2018 09:24:39 +0200
Subject: Ensure language is valid

- Do not override locale if user has choosen a locale from the login screen.
- Add some tests about locale url
---
 src/Wallabag/UserBundle/Resources/views/layout.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/UserBundle/Resources/views/layout.html.twig')

diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
index 6934c686..b53f8746 100644
--- a/src/Wallabag/UserBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
@@ -16,8 +16,8 @@
             {% endblock fos_user_content %}
         </div>
         <div class="center">
-            <a href="{{ path('changeLocale', {'language': 'de'}) }}">Deutsch</a>
-            <a href="{{ path('changeLocale', {'language': 'en'}) }}">English</a>
+            <a href="{{ path('changeLocale', {'language': 'de'}) }}">Deutsch</a> –
+            <a href="{{ path('changeLocale', {'language': 'en'}) }}">English</a> –
             <a href="{{ path('changeLocale', {'language': 'fr'}) }}">Français</a>
         </div>
     </div>
-- 
cgit v1.2.3