From d66379c44094f666b82917e39449d62a5f939833 Mon Sep 17 00:00:00 2001
From: mtyton <mateusz.tyton99@gmail.com>
Date: Sat, 30 Sep 2023 12:24:14 +0200
Subject: [PATCH] Tranlations works, it need some bug fixing

---
 artel/.woodpecker/.build.yml              |  3 ++-
 artel/artel/settings/base.py              |  2 +-
 artel/artel/static/images/icons/globe.svg |  3 +++
 artel/artel/templates/base.html           | 26 ++++++++++++-----------
 4 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 artel/artel/static/images/icons/globe.svg

diff --git a/artel/.woodpecker/.build.yml b/artel/.woodpecker/.build.yml
index ec03b7d..747181a 100644
--- a/artel/.woodpecker/.build.yml
+++ b/artel/.woodpecker/.build.yml
@@ -13,9 +13,10 @@ steps:
     image: docker:24.0.6
     secrets: []
     commands:
-      - docker compose -f artel/docker-compose-test.yml run --rm test_comfy
+      - docker compose -f artel/docker-compose-test.yml run --rm test_comfy && docker compose -f artel/docker-compose-test.yml down
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock 
     when:
       event: pull_request
       branch: ${CI_REPO_DEFAULT_BRANCH}
+  clean:
\ No newline at end of file
diff --git a/artel/artel/settings/base.py b/artel/artel/settings/base.py
index c1c4670..70d9367 100644
--- a/artel/artel/settings/base.py
+++ b/artel/artel/settings/base.py
@@ -85,7 +85,7 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
-    'django.middleware.locale.LocaleMiddleware',
+    'django.middleware.locale.LocaleMiddleware'
 ]
 
 ROOT_URLCONF = "artel.urls"
diff --git a/artel/artel/static/images/icons/globe.svg b/artel/artel/static/images/icons/globe.svg
new file mode 100644
index 0000000..96cf815
--- /dev/null
+++ b/artel/artel/static/images/icons/globe.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-globe" viewBox="0 0 16 16">
+  <path d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm7.5-6.923c-.67.204-1.335.82-1.887 1.855A7.97 7.97 0 0 0 5.145 4H7.5V1.077zM4.09 4a9.267 9.267 0 0 1 .64-1.539 6.7 6.7 0 0 1 .597-.933A7.025 7.025 0 0 0 2.255 4H4.09zm-.582 3.5c.03-.877.138-1.718.312-2.5H1.674a6.958 6.958 0 0 0-.656 2.5h2.49zM4.847 5a12.5 12.5 0 0 0-.338 2.5H7.5V5H4.847zM8.5 5v2.5h2.99a12.495 12.495 0 0 0-.337-2.5H8.5zM4.51 8.5a12.5 12.5 0 0 0 .337 2.5H7.5V8.5H4.51zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5H8.5zM5.145 12c.138.386.295.744.468 1.068.552 1.035 1.218 1.65 1.887 1.855V12H5.145zm.182 2.472a6.696 6.696 0 0 1-.597-.933A9.268 9.268 0 0 1 4.09 12H2.255a7.024 7.024 0 0 0 3.072 2.472zM3.82 11a13.652 13.652 0 0 1-.312-2.5h-2.49c.062.89.291 1.733.656 2.5H3.82zm6.853 3.472A7.024 7.024 0 0 0 13.745 12H11.91a9.27 9.27 0 0 1-.64 1.539 6.688 6.688 0 0 1-.597.933zM8.5 12v2.923c.67-.204 1.335-.82 1.887-1.855.173-.324.33-.682.468-1.068H8.5zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.65 13.65 0 0 1-.312 2.5zm2.802-3.5a6.959 6.959 0 0 0-.656-2.5H12.18c.174.782.282 1.623.312 2.5h2.49zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7.024 7.024 0 0 0-3.072-2.472c.218.284.418.598.597.933zM10.855 4a7.966 7.966 0 0 0-.468-1.068C9.835 1.897 9.17 1.282 8.5 1.077V4h2.355z"/>
+</svg>
\ No newline at end of file
diff --git a/artel/artel/templates/base.html b/artel/artel/templates/base.html
index 8e55bd5..44e09e1 100644
--- a/artel/artel/templates/base.html
+++ b/artel/artel/templates/base.html
@@ -65,20 +65,22 @@
             </div>
             <div class="row">
                 <div class="col-md-11 mt-5 ml-2"></div>
-                <div class="col-md-1 mt-5 ml-2 text-center">
+                <div class="col-md-1 mt-5 ml-2">
                       
-                    <div class="dropdown">
-                        <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                          {% trans "Languages" %}
-                        </button>
-                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                            {% for translation in page.get_translations.live %}
-                                <a class="dropdown-item" href= {% pageurl translation.specific %}{{translation.locale.language_code }} rel="alternate" hreflang="{{ translation.locale.language_code }}">
-                                        {{translation.locale.language_code}}
-                                </a>
-                            {% endfor %}
+                    {% if page %}
+                        <div class="dropdown">
+                            <button class="btn btn-outline-secondary btn-lg" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <img src="{% static 'images/icons/globe.svg' %}">
+                            </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 }}">
+                                            {{translation.locale.language_code | language_name}}
+                                    </a>
+                                {% endfor %}
+                            </div>
                         </div>
-                    </div>
+                    {% endif %}
 
                 </div>
             </div>