set URL-based language switch

2 files changed, 16 insertions, 23 deletions

diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py
index 1ae752f..0caade6 100644
--- a/talerbank/app/urls.py
+++ b/talerbank/app/urls.py
@@ -106,36 +106,35 @@ urlpatterns = [
          views.show_withdrawal,
          name="withdraw-show"
     ),
-    path("", RedirectView.as_view(pattern_name="profile"), name="index"),
     path("favicon.ico", views.ignore),
     path("config", views.config_view, name="config"),
-    path("logout", views.logout_view, name="logout"),
-    path("register", views.register, name="register"),
-    path("profile", views.profile_page, name="profile"),
-    path("payto-form", views.payto_form, name="payto-form"),
     path("history", views.serve_history, name="history"),
     path("public-accounts",
          views.serve_public_accounts, name="public-accounts"),
-    path("public-accounts/<str:name>",
-         views.serve_public_accounts,
-         name="public-accounts"
-    ),
-    path("public-accounts/<str:name>/<int:page>",
-         views.serve_public_accounts,
-         name="public-accounts"
-    ),
     path("payto-transfer",
          views.payto_transfer,
          name="payto-transfer"),
+]
+
+urlpatterns += i18n_patterns(
+    path("", RedirectView.as_view(pattern_name="profile"), name="index"),
+    path("logout", views.logout_view, name="logout"),
+    path("register", views.register, name="register"),
+    path("profile", views.profile_page, name="profile"),
+    path("payto-form", views.payto_form, name="payto-form"),
     path("login",
         auth_views.LoginView.as_view(
             template_name="login.html",
             authentication_form=views.TalerAuthenticationForm,
         ),
         name="login"
+    ),
+    path("public-accounts/<str:name>",
+         views.serve_public_accounts,
+         name="public-accounts"
+    ),
+    path("public-accounts/<str:name>/<int:page>",
+         views.serve_public_accounts,
+         name="public-accounts"
     )
-]
-
-urlpatterns += i18n_patterns(
-    path("", views.set_lang),
 )
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index c1165e6..ecb0ec7 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -85,12 +85,6 @@ def login_via_headers(view_func):
         return view_func(request, user_account, *args, **kwargs)
     return wraps(view_func)(_decorator)
 
-def set_lang(request):
-    print("set {}, to {}".format(settings.LANGUAGE_COOKIE_NAME, request.LANGUAGE_CODE))
-    response = redirect("index")
-    response.set_cookie(settings.LANGUAGE_COOKIE_NAME, request.LANGUAGE_CODE)
-    return response
-
 def allow_origin_star(view_func):
     def _decorator(request, *args, **kwargs):
         response = view_func(request, *args, **kwargs)