From d0d77956ad3554a1c46fcad73baf0b96638bdf24 Mon Sep 17 00:00:00 2001
From: mtyton <mateusz.tyton99@gmail.com>
Date: Sat, 30 Sep 2023 13:04:24 +0200
Subject: [PATCH] Translations works properly now

---
 artel/artel/settings/base.py    |  7 ++++---
 artel/artel/templates/base.html |  2 +-
 artel/artel/urls.py             | 18 +++---------------
 artel/requirements.txt          |  1 +
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/artel/artel/settings/base.py b/artel/artel/settings/base.py
index 70d9367..55e2616 100644
--- a/artel/artel/settings/base.py
+++ b/artel/artel/settings/base.py
@@ -43,6 +43,8 @@ INSTALLED_APPS = [
     "blog",
     "search",
     "setup",
+    "wagtail_localize",
+    "wagtail_localize.locales",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",
     "wagtail.contrib.simple_translation",
@@ -57,7 +59,6 @@ INSTALLED_APPS = [
     'wagtail.contrib.modeladmin',
     "wagtail",
     "wagtailmenus",
-    'wagtail.locales',
     "modelcluster",
     "taggit",
     "django.contrib.admin",
@@ -84,8 +85,8 @@ MIDDLEWARE = [
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "django.middleware.security.SecurityMiddleware",
-    "wagtail.contrib.redirects.middleware.RedirectMiddleware",
-    'django.middleware.locale.LocaleMiddleware'
+    'django.middleware.locale.LocaleMiddleware',
+    "wagtail.contrib.redirects.middleware.RedirectMiddleware"
 ]
 
 ROOT_URLCONF = "artel.urls"
diff --git a/artel/artel/templates/base.html b/artel/artel/templates/base.html
index 44e09e1..c1adbbc 100644
--- a/artel/artel/templates/base.html
+++ b/artel/artel/templates/base.html
@@ -74,7 +74,7 @@
                             </button>
                             <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                                 {% for translation in page.get_translations.live %}
-                                    <a class="dropdown-item text-center" href="{% pageurl translation.specific %}"" rel="alternate" hreflang="{{ translation.locale.language_code }}">
+                                    <a class="dropdown-item text-center" href="{% pageurl translation %}"" rel="alternate" hreflang="{{ translation.locale.language_code }}">
                                             {{translation.locale.language_code | language_name}}
                                     </a>
                                 {% endfor %}
diff --git a/artel/artel/urls.py b/artel/artel/urls.py
index b40ba70..18df945 100644
--- a/artel/artel/urls.py
+++ b/artel/artel/urls.py
@@ -23,17 +23,10 @@ urlpatterns = [
     path("django-admin/", admin.site.urls),
     path("admin/", include(wagtailadmin_urls)),
     path("documents/", include(wagtaildocs_urls)),
-    path("search/", search_views.search, name="search"),
     path('store-app/', include('store.urls')),
     path('setup/', include('setup.urls')),
 ]
 
-urlpatterns += i18n_patterns(
-    path('search/', search_views.search, name='search'),
-    path("store-app/", include("store.urls")),
-    path("", include(wagtail_urls)),
-)
-
 if settings.DEBUG:
     from django.conf.urls.static import static
     from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -43,12 +36,7 @@ if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL,
                           document_root=settings.MEDIA_ROOT)
 
-urlpatterns = urlpatterns + [
-    # For anything not caught by a more specific rule above, hand over to
-    # Wagtail's page serving mechanism. This should be the last pattern in
-    # the list:
+urlpatterns = urlpatterns + i18n_patterns(
+    path('search/', search_views.search, name='search'),
     path("", include(wagtail_urls)),
-    # Alternatively, if you want Wagtail pages to be served from a subpath
-    # of your site, rather than the site root:
-    #    path("pages/", include(wagtail_urls)),
-]
+)
diff --git a/artel/requirements.txt b/artel/requirements.txt
index a459be6..db25b3d 100644
--- a/artel/requirements.txt
+++ b/artel/requirements.txt
@@ -15,3 +15,4 @@ easy_thumbnails==2.8.5
 num2words==0.5.12
 sentry-sdk==1.28.0
 pandas==2.0.3
+wagtail-localize==1.5.2