From 28cab1bee87c12264b08a28c14e59ce701d739e4 Mon Sep 17 00:00:00 2001
From: Chatewgne <chatewgne@gmail.com>
Date: Tue, 28 May 2024 17:07:20 +0200
Subject: [PATCH 01/49] =?UTF-8?q?=F0=9F=91=B7=20[CI]=20Add=20job=20to=20ch?=
 =?UTF-8?q?eck=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/lint.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 758254c7f1..bd94b3ad8e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -36,3 +36,35 @@ jobs:
       - name: Flake8
         run: |
           flake8 geotrek
+
+  translations:
+    name: Checking .po files are up-to-date
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ./.github/actions/python-cache-requirements
+        with:
+          requirements: requirements.txt
+
+      - name: Prepare test env
+        run: |
+          sudo apt-get update -q
+          sudo apt-get -qq -y install gettext
+
+      - name: Generate translation files
+        run: |
+          python3 ./manage.py makemessages -a --no-location --no-obsolete
+
+      - uses: tj-actions/verify-changed-files@v18
+        id: verify-changed-files
+        with:
+          files: |
+            **/*.po
+
+      - name: Verify translation files changed
+        if: steps.verify-changed-files.outputs.files_changed == 'true'
+        run: |
+          echo "Translation file(s) changed: ${{ steps.verify-changed-files.outputs.changed_files }}"
+          git diff
+          core.setFailed('Please fix your translation files with ./manage.py makemessages -a --no-location --no-obsolete')

From 893da15960b36ee2b272e91e6aba57a561fe897f Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 11:22:33 +0200
Subject: [PATCH 02/49] fix change version file

---
 .github/workflows/lint.yml                   | 4 ++--
 geotrek/core/locale/fr/LC_MESSAGES/django.po | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index bd94b3ad8e..d361c5343c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -54,9 +54,9 @@ jobs:
 
       - name: Generate translation files
         run: |
-          python3 ./manage.py makemessages -a --no-location --no-obsolete
+          django-admin makemessages -a --no-location --no-obsolete
 
-      - uses: tj-actions/verify-changed-files@v18
+      - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files
         with:
           files: |
diff --git a/geotrek/core/locale/fr/LC_MESSAGES/django.po b/geotrek/core/locale/fr/LC_MESSAGES/django.po
index 5dc65d6c19..4d756f151b 100644
--- a/geotrek/core/locale/fr/LC_MESSAGES/django.po
+++ b/geotrek/core/locale/fr/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 4.1.1\n"
 
-msgid "Core"
+msgid "Coree"
 msgstr "Cœur"
 
 msgid "Topology is empty."

From ae5b19c7d91a0abda265cf418f968d4da3d750ce Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 11:33:45 +0200
Subject: [PATCH 03/49] fix change version file

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d361c5343c..49fe2a3b79 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -55,6 +55,7 @@ jobs:
       - name: Generate translation files
         run: |
           django-admin makemessages -a --no-location --no-obsolete
+          ./manage.py check_versions
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 5af6bebac951da4ec1127c64ac3234f790b535e0 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 11:37:24 +0200
Subject: [PATCH 04/49] fix change version file

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 49fe2a3b79..b713ad36d8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -56,6 +56,7 @@ jobs:
         run: |
           django-admin makemessages -a --no-location --no-obsolete
           ./manage.py check_versions
+          ls -als
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 11556d825fd169b77822cf9908dd54c1cb576845 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 11:45:08 +0200
Subject: [PATCH 05/49] fix change version file

---
 .github/workflows/lint.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b713ad36d8..aff844c8c0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -55,8 +55,7 @@ jobs:
       - name: Generate translation files
         run: |
           django-admin makemessages -a --no-location --no-obsolete
-          ./manage.py check_versions
-          ls -als
+          ./manage.py
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 2ff68c4e991dcd4279ace9eedf6549c02adaf7aa Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 11:48:29 +0200
Subject: [PATCH 06/49] fix change version file

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index aff844c8c0..009b66c7b6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Prepare test env
         run: |
           sudo apt-get update -q
-          sudo apt-get -qq -y install gettext
+          sudo apt-get -qq -y install gettext gdal-bin
 
       - name: Generate translation files
         run: |

From 9744f93aeaa09ef8b35f260a706fec3fa3ab0057 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 11:50:58 +0200
Subject: [PATCH 07/49] fix change version file

---
 .github/workflows/lint.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 009b66c7b6..294d7ca2e2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -54,8 +54,7 @@ jobs:
 
       - name: Generate translation files
         run: |
-          django-admin makemessages -a --no-location --no-obsolete
-          ./manage.py
+          ENV=dev django-admin makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 96165a607b213234222d25634a58bae23dae3b54 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 11:55:08 +0200
Subject: [PATCH 08/49] fix change version file

---
 .github/workflows/lint.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 294d7ca2e2..a3a4f95084 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -54,8 +54,10 @@ jobs:
 
       - name: Generate translation files
         run: |
+          ENV=dev ./manage.py
           ENV=dev django-admin makemessages -a --no-location --no-obsolete
 
+
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files
         with:

From f200283c06672cc7ca40eba30212eb03ae7c8e38 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:07:02 +0200
Subject: [PATCH 09/49] fix change version file

---
 .github/workflows/lint.yml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a3a4f95084..40f11284a0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -40,23 +40,32 @@ jobs:
   translations:
     name: Checking .po files are up-to-date
     runs-on: ubuntu-latest
+    container: makinacorpus/geodjango:${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ['focal-3.8']
+        python-version: ['3.8']
+
     steps:
       - uses: actions/checkout@v3
-
-      - uses: ./.github/actions/python-cache-requirements
+      - uses: actions/cache@v3
         with:
-          requirements: requirements.txt
+            path: |
+                ./venv
+            key: pip-${{ matrix.python-version }}-${{ matrix.os }}-${{ hashFiles('./requirements.txt', './dev-requirements.txt', './docs/requirements.txt') }}
+            restore-keys: |
+              pip-${{ matrix.python-version }}-${{ matrix.os }}-${{ hashFiles('./requirements.txt', './dev-requirements.txt', './docs/requirements.txt') }}
+              pip-${{ matrix.python-version }}-${{ matrix.os }}
 
-      - name: Prepare test env
+      - nme: Install python deps
         run: |
-          sudo apt-get update -q
-          sudo apt-get -qq -y install gettext gdal-bin
+          python -m venv venv
+          source venv/bin/activate
+          pip install django -c requirements.txt
 
       - name: Generate translation files
         run: |
-          ENV=dev ./manage.py
-          ENV=dev django-admin makemessages -a --no-location --no-obsolete
-
+          ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 4e194069ca3d67e5c5ddb02c747c5de93a327163 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:08:11 +0200
Subject: [PATCH 10/49] fix change version file

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 40f11284a0..c422d6b392 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -57,7 +57,7 @@ jobs:
               pip-${{ matrix.python-version }}-${{ matrix.os }}-${{ hashFiles('./requirements.txt', './dev-requirements.txt', './docs/requirements.txt') }}
               pip-${{ matrix.python-version }}-${{ matrix.os }}
 
-      - nme: Install python deps
+      - name: Install python deps
         run: |
           python -m venv venv
           source venv/bin/activate

From db03acc6775f6fc02ae4853f353a88ab48f95225 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:09:48 +0200
Subject: [PATCH 11/49] fix change version file

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c422d6b392..f6c569ead0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Install python deps
         run: |
-          python -m venv venv
+          python3.8 -m venv venv
           source venv/bin/activate
           pip install django -c requirements.txt
 

From eca40aa7050ba5642ca61ffc247071e0d569ee2a Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:11:14 +0200
Subject: [PATCH 12/49] fix change version file

---
 .github/workflows/lint.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f6c569ead0..6e6701083c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -60,12 +60,11 @@ jobs:
       - name: Install python deps
         run: |
           python3.8 -m venv venv
-          source venv/bin/activate
-          pip install django -c requirements.txt
+          ./venv/bin/pip install django -c requirements.txt
 
       - name: Generate translation files
         run: |
-          ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
+          ENV=dev ./venv/bin/python ./manage.py makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 47d495de54f18ec71de1ee5c3bea4d917077cd40 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:12:56 +0200
Subject: [PATCH 13/49] fix change version file

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6e6701083c..bd96587d3e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -64,6 +64,7 @@ jobs:
 
       - name: Generate translation files
         run: |
+          mkdir -p /opt/geotrek-admin/var/log
           ENV=dev ./venv/bin/python ./manage.py makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20

From d3125762d8aa193c3f11979c0be863c83869ac14 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:15:28 +0200
Subject: [PATCH 14/49] fix change version file

---
 .github/workflows/lint.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index bd96587d3e..904185b4aa 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -57,8 +57,10 @@ jobs:
               pip-${{ matrix.python-version }}-${{ matrix.os }}-${{ hashFiles('./requirements.txt', './dev-requirements.txt', './docs/requirements.txt') }}
               pip-${{ matrix.python-version }}-${{ matrix.os }}
 
-      - name: Install python deps
+      - name: Install deps
         run: |
+          sudo apt-get -qq update
+          sudo apt-get -yqq install libcairo2
           python3.8 -m venv venv
           ./venv/bin/pip install django -c requirements.txt
 

From 2b0fda0fd7ac7935877a9f4178e86a333184ee67 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:18:34 +0200
Subject: [PATCH 15/49] fix change version file

---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 904185b4aa..a86bcf282c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -59,8 +59,8 @@ jobs:
 
       - name: Install deps
         run: |
-          sudo apt-get -qq update
-          sudo apt-get -yqq install libcairo2
+          apt-get -qq update
+          apt-get -yqq install libcairo2
           python3.8 -m venv venv
           ./venv/bin/pip install django -c requirements.txt
 

From 35b5c03c4397cc1b040db3f510242fe175e257b8 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:21:48 +0200
Subject: [PATCH 16/49] fix change version file

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a86bcf282c..a9c8542a7b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -79,5 +79,5 @@ jobs:
         if: steps.verify-changed-files.outputs.files_changed == 'true'
         run: |
           echo "Translation file(s) changed: ${{ steps.verify-changed-files.outputs.changed_files }}"
-          git diff
+          git diff --no-inde
           core.setFailed('Please fix your translation files with ./manage.py makemessages -a --no-location --no-obsolete')

From 34cc5de8cf6878fb87089aa3f5f5b48c2d153789 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:29:44 +0200
Subject: [PATCH 17/49] fix change version file

---
 .github/workflows/lint.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a9c8542a7b..a2e958949e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -75,9 +75,12 @@ jobs:
           files: |
             **/*.po
 
+
       - name: Verify translation files changed
         if: steps.verify-changed-files.outputs.files_changed == 'true'
+        env:
+          CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
         run: |
-          echo "Translation file(s) changed: ${{ steps.verify-changed-files.outputs.changed_files }}"
-          git diff --no-inde
+          echo "Changed files: $CHANGED_FILES"
+          git diff -p
           core.setFailed('Please fix your translation files with ./manage.py makemessages -a --no-location --no-obsolete')

From be768b5bd8e2db41c5a6c8079c01f46d0f710a9d Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:50:53 +0200
Subject: [PATCH 18/49] fix change version file

---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a2e958949e..8cf85cd91d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -24,7 +24,7 @@ jobs:
     name: Checking Flake8 rules
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/python-cache-requirements
         with:
           requirements: dev-requirements.txt
@@ -47,7 +47,7 @@ jobs:
         python-version: ['3.8']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/cache@v3
         with:
             path: |

From 4d90bb109cf21c9ad39c3ef87837d21ef09d5080 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 12:52:27 +0200
Subject: [PATCH 19/49] fix change version file

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8cf85cd91d..448fd9f63f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -82,5 +82,5 @@ jobs:
           CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
         run: |
           echo "Changed files: $CHANGED_FILES"
-          git diff -p
+          #git diff -p
           core.setFailed('Please fix your translation files with ./manage.py makemessages -a --no-location --no-obsolete')

From 22d5be1bb398f18e0e620220c8f00ae1e2ca9e68 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 13:53:26 +0200
Subject: [PATCH 20/49] fix change version file

---
 .github/workflows/lint.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 448fd9f63f..01557a9393 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -40,7 +40,6 @@ jobs:
   translations:
     name: Checking .po files are up-to-date
     runs-on: ubuntu-latest
-    container: makinacorpus/geodjango:${{ matrix.os }}
     strategy:
       matrix:
         os: ['focal-3.8']
@@ -48,6 +47,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: setup-python@v5
+          python-version: "3.8.18"
       - uses: actions/cache@v3
         with:
             path: |
@@ -60,7 +61,7 @@ jobs:
       - name: Install deps
         run: |
           apt-get -qq update
-          apt-get -yqq install libcairo2
+          apt-get -yqq install gettext libcairo2
           python3.8 -m venv venv
           ./venv/bin/pip install django -c requirements.txt
 

From ad5afa7778502de983fe80fb5771eaea0cff930b Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 13:55:12 +0200
Subject: [PATCH 21/49] fix change version file

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 01557a9393..f0da55c3fe 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -48,6 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: setup-python@v5
+        with:
           python-version: "3.8.18"
       - uses: actions/cache@v3
         with:

From 1a668c857eae0e4b06475cce7326638e965edded Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 13:58:51 +0200
Subject: [PATCH 22/49] fix change version file

---
 .github/workflows/lint.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f0da55c3fe..ddf1332ff1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -47,9 +47,15 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: setup-python@v5
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.8.18"
+            cache: 'pip'
+            python-version: '3.8.18'
+            cache-dependency-path: |
+                requirements.txt
+                dev-requirements.txt
+                docs/requirements.txt
+
       - uses: actions/cache@v3
         with:
             path: |

From d68a4f6f41733efe9679c26a1322d2e7a24f9c22 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:01:01 +0200
Subject: [PATCH 23/49] fix change version file

---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ddf1332ff1..712838c17c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -67,8 +67,8 @@ jobs:
 
       - name: Install deps
         run: |
-          apt-get -qq update
-          apt-get -yqq install gettext libcairo2
+          sudo apt-get -qq update
+          sudo apt-get -yqq install gettext libcairo2
           python3.8 -m venv venv
           ./venv/bin/pip install django -c requirements.txt
 

From de4143d17622df160e83010ac79dcfe50b189690 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:02:34 +0200
Subject: [PATCH 24/49] fix change version file

---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 712838c17c..a74de84108 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -68,9 +68,9 @@ jobs:
       - name: Install deps
         run: |
           sudo apt-get -qq update
-          sudo apt-get -yqq install gettext libcairo2
+          sudo apt-get -yqq install gettext libcairo2 libpq-dev
           python3.8 -m venv venv
-          ./venv/bin/pip install django -c requirements.txt
+          ./venv/bin/pip install -r requirements.txt
 
       - name: Generate translation files
         run: |

From 6152a7d1914c4bb7fa14b54dbddc24f81efebfab Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:18:30 +0200
Subject: [PATCH 25/49] fix change version file

---
 .github/workflows/lint.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a74de84108..6004f3b1d8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -40,6 +40,21 @@ jobs:
   translations:
     name: Checking .po files are up-to-date
     runs-on: ubuntu-latest
+    envenv:
+      DEBIAN_FRONTEND: noninteractive
+      POSTGRES_DB: ci_test
+      POSTGRES_PASSWORD: ci_test
+      POSTGRES_USER: ci_test
+      POSTGRES_HOST: 127.0.0.1
+      SERVER_NAME: geotrek.local
+      SECRET_KEY: test-test-test
+      CONVERSION_HOST: localhost
+      CAPTURE_HOST: localhost
+      REDIS_HOST: 127.0.0.1
+      VAR_DIR: /home/runner/work/Geotrek-admin/Geotrek-admin/var
+      LANG: C.UTF-8
+      LANGUAGES: en fr
+      LANGUAGE_CODE: en
     strategy:
       matrix:
         os: ['focal-3.8']

From b8cfb0e3c6a13fbfcc3ad0a64da178bec50abcf0 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:26:11 +0200
Subject: [PATCH 26/49] fix change version file

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6004f3b1d8..af9cea0c55 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -40,7 +40,7 @@ jobs:
   translations:
     name: Checking .po files are up-to-date
     runs-on: ubuntu-latest
-    envenv:
+    env:
       DEBIAN_FRONTEND: noninteractive
       POSTGRES_DB: ci_test
       POSTGRES_PASSWORD: ci_test

From 2e26c3e679ffb4454e9f34de169be62c78162546 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:33:23 +0200
Subject: [PATCH 27/49] fix change version file

---
 .github/workflows/lint.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index af9cea0c55..caf723fe44 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -89,7 +89,8 @@ jobs:
 
       - name: Generate translation files
         run: |
-          mkdir -p /opt/geotrek-admin/var/log
+          mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
+          mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
           ENV=dev ./venv/bin/python ./manage.py makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20

From 6811153e162083c4096901e49ad1be4d687b4042 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:44:47 +0200
Subject: [PATCH 28/49] fix change version file

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index caf723fe44..87748fa8ac 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -89,6 +89,7 @@ jobs:
 
       - name: Generate translation files
         run: |
+          rm cypress/custom.py.
           mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
           mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
           ENV=dev ./venv/bin/python ./manage.py makemessages -a --no-location --no-obsolete

From ef6ce2aaeb2a81aeed3b5b509f764ad2b424a0f8 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:46:50 +0200
Subject: [PATCH 29/49] fix change version file

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 87748fa8ac..6782b3b3aa 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -89,7 +89,7 @@ jobs:
 
       - name: Generate translation files
         run: |
-          rm cypress/custom.py.
+          rm cypress/custom.py
           mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
           mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
           ENV=dev ./venv/bin/python ./manage.py makemessages -a --no-location --no-obsolete

From 5ea719686ebddc05e0cd347df5bb247b7db1e9c8 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:48:57 +0200
Subject: [PATCH 30/49] fix change version file

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6782b3b3aa..d24183d129 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -90,6 +90,7 @@ jobs:
       - name: Generate translation files
         run: |
           rm cypress/custom.py
+          ls -als .
           mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
           mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
           ENV=dev ./venv/bin/python ./manage.py makemessages -a --no-location --no-obsolete

From 159776d622d82fae144d64b5a423e1a5fa936ef5 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 14:49:35 +0200
Subject: [PATCH 31/49] fix change version file

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d24183d129..66f26887a7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -41,6 +41,7 @@ jobs:
     name: Checking .po files are up-to-date
     runs-on: ubuntu-latest
     env:
+      ENV: dev
       DEBIAN_FRONTEND: noninteractive
       POSTGRES_DB: ci_test
       POSTGRES_PASSWORD: ci_test

From f7b085e7b4f49a00f43a3c1c65e5eff13d75794b Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 5 Jun 2024 15:01:28 +0200
Subject: [PATCH 32/49] fix change version file

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 66f26887a7..46d9ef3848 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -94,7 +94,7 @@ jobs:
           ls -als .
           mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
           mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
-          ENV=dev ./venv/bin/python ./manage.py makemessages -a --no-location --no-obsolete
+          ENV=dev django-admin makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 2befe15c69cd3f33fc22c69cb4fe34e6cb163aa4 Mon Sep 17 00:00:00 2001
From: Jean-Etienne Castagnede <j.e.castagnede@gmail.com>
Date: Tue, 1 Oct 2024 14:28:26 +0200
Subject: [PATCH 33/49] Apply suggestions from code review

---
 .github/workflows/lint.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 46d9ef3848..6312d53aa5 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -90,11 +90,9 @@ jobs:
 
       - name: Generate translation files
         run: |
-          rm cypress/custom.py
-          ls -als .
           mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
           mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
-          ENV=dev django-admin makemessages -a --no-location --no-obsolete
+          ENV=dev ./venv/bin/django-admin makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 16cd1c4ca5d010b5be56bf640e627edc4f26e8b7 Mon Sep 17 00:00:00 2001
From: Jean-Etienne Castagnede <j.e.castagnede@gmail.com>
Date: Tue, 1 Oct 2024 14:49:01 +0200
Subject: [PATCH 34/49] Apply suggestions from code review

---
 .github/workflows/lint.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6312d53aa5..e55f59dafd 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -86,13 +86,14 @@ jobs:
           sudo apt-get -qq update
           sudo apt-get -yqq install gettext libcairo2 libpq-dev
           python3.8 -m venv venv
-          ./venv/bin/pip install -r requirements.txt
+          pip install -r requirements.txt
 
       - name: Generate translation files
         run: |
+          rm cypress/custom.py
           mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
           mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
-          ENV=dev ./venv/bin/django-admin makemessages -a --no-location --no-obsolete
+          ENV=dev django-admin makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 7b6256127a8455f197c803d242da902896e79cec Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Tue, 1 Oct 2024 15:29:23 +0200
Subject: [PATCH 35/49] use new mapentity

---
 .github/workflows/lint.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e55f59dafd..deedb0d15e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -93,7 +93,7 @@ jobs:
           rm cypress/custom.py
           mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
           mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
-          ENV=dev django-admin makemessages -a --no-location --no-obsolete
+          ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files
@@ -101,7 +101,6 @@ jobs:
           files: |
             **/*.po
 
-
       - name: Verify translation files changed
         if: steps.verify-changed-files.outputs.files_changed == 'true'
         env:

From 90702d0fef8ea8dd3024f1f2babe30d93579746e Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 16:29:31 +0200
Subject: [PATCH 36/49] fix lint

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index deedb0d15e..52af01ecc7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -87,6 +87,7 @@ jobs:
           sudo apt-get -yqq install gettext libcairo2 libpq-dev
           python3.8 -m venv venv
           pip install -r requirements.txt
+          pip install -r dev-requirements.txt
 
       - name: Generate translation files
         run: |

From a128c1da0ce499ac73215b855287ffa8160187ad Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 16:37:21 +0200
Subject: [PATCH 37/49] fix lint

---
 .github/workflows/lint.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 52af01ecc7..9200c46972 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -92,8 +92,7 @@ jobs:
       - name: Generate translation files
         run: |
           rm cypress/custom.py
-          mkdir -p ./var/log ./var/cache/sessions geotrek/locale ./var/conf/extra_locale
-          mkdir -p $VAR_DIR/conf/extra_static $VAR_DIR/tmp
+          mkdir -p $VAR_DIR/log $VAR_DIR/sessions geotrek/locale $VAR_DIR/conf/extra_locale $VAR_DIR/conf/extra_static $VAR_DIR/tmp
           ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20

From 89e86015e0edb71e82351a2e23f638f4ee47f669 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 17:05:19 +0200
Subject: [PATCH 38/49] fix lint

---
 .github/workflows/lint.yml | 73 --------------------------------------
 .github/workflows/test.yml | 18 ++++++++++
 2 files changed, 18 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9200c46972..7f519f702c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -36,76 +36,3 @@ jobs:
       - name: Flake8
         run: |
           flake8 geotrek
-
-  translations:
-    name: Checking .po files are up-to-date
-    runs-on: ubuntu-latest
-    env:
-      ENV: dev
-      DEBIAN_FRONTEND: noninteractive
-      POSTGRES_DB: ci_test
-      POSTGRES_PASSWORD: ci_test
-      POSTGRES_USER: ci_test
-      POSTGRES_HOST: 127.0.0.1
-      SERVER_NAME: geotrek.local
-      SECRET_KEY: test-test-test
-      CONVERSION_HOST: localhost
-      CAPTURE_HOST: localhost
-      REDIS_HOST: 127.0.0.1
-      VAR_DIR: /home/runner/work/Geotrek-admin/Geotrek-admin/var
-      LANG: C.UTF-8
-      LANGUAGES: en fr
-      LANGUAGE_CODE: en
-    strategy:
-      matrix:
-        os: ['focal-3.8']
-        python-version: ['3.8']
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-            cache: 'pip'
-            python-version: '3.8.18'
-            cache-dependency-path: |
-                requirements.txt
-                dev-requirements.txt
-                docs/requirements.txt
-
-      - uses: actions/cache@v3
-        with:
-            path: |
-                ./venv
-            key: pip-${{ matrix.python-version }}-${{ matrix.os }}-${{ hashFiles('./requirements.txt', './dev-requirements.txt', './docs/requirements.txt') }}
-            restore-keys: |
-              pip-${{ matrix.python-version }}-${{ matrix.os }}-${{ hashFiles('./requirements.txt', './dev-requirements.txt', './docs/requirements.txt') }}
-              pip-${{ matrix.python-version }}-${{ matrix.os }}
-
-      - name: Install deps
-        run: |
-          sudo apt-get -qq update
-          sudo apt-get -yqq install gettext libcairo2 libpq-dev
-          python3.8 -m venv venv
-          pip install -r requirements.txt
-          pip install -r dev-requirements.txt
-
-      - name: Generate translation files
-        run: |
-          rm cypress/custom.py
-          mkdir -p $VAR_DIR/log $VAR_DIR/sessions geotrek/locale $VAR_DIR/conf/extra_locale $VAR_DIR/conf/extra_static $VAR_DIR/tmp
-          ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
-
-      - uses: tj-actions/verify-changed-files@v20
-        id: verify-changed-files
-        with:
-          files: |
-            **/*.po
-
-      - name: Verify translation files changed
-        if: steps.verify-changed-files.outputs.files_changed == 'true'
-        env:
-          CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
-        run: |
-          echo "Changed files: $CHANGED_FILES"
-          #git diff -p
-          core.setFailed('Please fix your translation files with ./manage.py makemessages -a --no-location --no-obsolete')
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 36dd80c108..10ad14f3f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -148,6 +148,24 @@ jobs:
         ./venv/bin/coverage combine
         ./venv/bin/coverage xml -o coverage.xml
 
+    - name: Check translations
+      run: |
+        ENV=dev ./venv/bin/python3 ./manage.py makemessages -a --no-location --no-obsolete
+
+    - uses: tj-actions/verify-changed-files@v20
+      id: verify-changed-files
+      with:
+        files: |
+          **/*.po
+
+    - name: Verify translation files changed
+      if: steps.verify-changed-files.outputs.files_changed == 'true'
+      env:
+        CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
+      run: |
+        echo "Changed files: $CHANGED_FILES"
+        core.setFailed('Please fix your translation files with ./manage.py makemessages -a --no-location --no-obsolete')
+
     - name: Save coverage
       uses: actions/upload-artifact@v4
       if: ${{ matrix.os != 'bionic-3.8' }}

From 51eecc6f7dd159c8e6108be465ac7428e57ad5eb Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 17:30:43 +0200
Subject: [PATCH 39/49] fix lint

---
 .github/workflows/lint.yml | 32 ++++++++++++++++++++++++++++++++
 .github/workflows/test.yml | 18 ------------------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7f519f702c..42082462b3 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -36,3 +36,35 @@ jobs:
       - name: Flake8
         run: |
           flake8 geotrek
+
+  translations:
+    name: Checking translations files are up-to-date
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/python-cache-requirements
+        with:
+          requirements: requirements.txt
+      - name: Install dependencies
+        run: |
+          sudo apt install gettext
+          pip3 install -r dev-requirements.txt
+
+      - name: Check translations
+        run: |
+          ENV=dev ./venv/bin/python3 ./manage.py makemessages -a --no-location --no-obsolete
+
+      - uses: tj-actions/verify-changed-files@v20
+        id: verify-changed-files
+        with:
+          files: |
+            **/*.po
+
+      - name: Verify translation files changed
+        if: steps.verify-changed-files.outputs.files_changed == 'true'
+        env:
+          CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
+        run: |
+          echo "Changed files: $CHANGED_FILES"
+          git diff
+          core.setFailed('Please fix your translation files with ./manage.py makemessages -a --no-location --no-obsolete')
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 10ad14f3f4..36dd80c108 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -148,24 +148,6 @@ jobs:
         ./venv/bin/coverage combine
         ./venv/bin/coverage xml -o coverage.xml
 
-    - name: Check translations
-      run: |
-        ENV=dev ./venv/bin/python3 ./manage.py makemessages -a --no-location --no-obsolete
-
-    - uses: tj-actions/verify-changed-files@v20
-      id: verify-changed-files
-      with:
-        files: |
-          **/*.po
-
-    - name: Verify translation files changed
-      if: steps.verify-changed-files.outputs.files_changed == 'true'
-      env:
-        CHANGED_FILES: ${{ steps.verify-changed-files.outputs.changed_files }}
-      run: |
-        echo "Changed files: $CHANGED_FILES"
-        core.setFailed('Please fix your translation files with ./manage.py makemessages -a --no-location --no-obsolete')
-
     - name: Save coverage
       uses: actions/upload-artifact@v4
       if: ${{ matrix.os != 'bionic-3.8' }}

From 27b511cf3727e72f5fbd9f55da01d4c70886d7e2 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 17:32:41 +0200
Subject: [PATCH 40/49] fix lint

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 42082462b3..7ac0a1616f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -52,7 +52,7 @@ jobs:
 
       - name: Check translations
         run: |
-          ENV=dev ./venv/bin/python3 ./manage.py makemessages -a --no-location --no-obsolete
+          ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 192eb17cbd53f09c1d743859fdb47c90282a3cad Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 17:39:11 +0200
Subject: [PATCH 41/49] fix lint

---
 .github/workflows/lint.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7ac0a1616f..e37fbba32f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -49,6 +49,8 @@ jobs:
         run: |
           sudo apt install gettext
           pip3 install -r dev-requirements.txt
+          mkdir -p /opt/geotrek-admin/var/log
+          touch /opt/geotrek-admin/var/log/geotrek.log
 
       - name: Check translations
         run: |

From 3a2a8d9d8c61f78eaf46c592bd5af9edd6c26bff Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 17:43:49 +0200
Subject: [PATCH 42/49] fix lint

---
 .github/workflows/lint.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e37fbba32f..30fca2a2e8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,15 +8,12 @@ on:
       - 'dev-requirements.txt'  # if dev-requirements.txt change
       - 'setup.cfg'   # if lint tools configuration change
 
-env:
-  DEBIAN_FRONTEND: noninteractive
-
 jobs:
   migrations:
     name: Checking SRID in migrations files
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           test $(ls geotrek/*/migrations/*.py | xargs grep -l srid | xargs grep -L SRID | wc -l) -eq 0
 
@@ -47,7 +44,7 @@ jobs:
           requirements: requirements.txt
       - name: Install dependencies
         run: |
-          sudo apt install gettext
+          sudo apt-get install -y gettext
           pip3 install -r dev-requirements.txt
           mkdir -p /opt/geotrek-admin/var/log
           touch /opt/geotrek-admin/var/log/geotrek.log

From 630665a23d42f785cab400f4f01aa89ddf96cd52 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 18:09:55 +0200
Subject: [PATCH 43/49] fix lint

---
 .github/workflows/lint.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 30fca2a2e8..35c25f7fb2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -48,6 +48,8 @@ jobs:
           pip3 install -r dev-requirements.txt
           mkdir -p /opt/geotrek-admin/var/log
           touch /opt/geotrek-admin/var/log/geotrek.log
+          pwd
+          ls -als
 
       - name: Check translations
         run: |

From 3a55852da86dadc4cd8fc13cd238b213232999f4 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 18:17:31 +0200
Subject: [PATCH 44/49] fix lint

---
 .github/workflows/lint.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 35c25f7fb2..504abdd405 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,6 +9,8 @@ on:
       - 'setup.cfg'   # if lint tools configuration change
 
 jobs:
+  env:
+    VAR_DIR: /home/runner/work/Geotrek-admin/Geotrek-admin/var
   migrations:
     name: Checking SRID in migrations files
     runs-on: ubuntu-latest
@@ -46,14 +48,12 @@ jobs:
         run: |
           sudo apt-get install -y gettext
           pip3 install -r dev-requirements.txt
-          mkdir -p /opt/geotrek-admin/var/log
-          touch /opt/geotrek-admin/var/log/geotrek.log
-          pwd
-          ls -als
+          mkdir -p var/static var/conf/extra_static var/media/upload var/cache/sessions var/cache/api_v2 var/cache/fat var/log var/conf/extra_templates var/conf/extra_locale var/tmp
 
       - name: Check translations
         run: |
           ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
+          ls -als
 
       - uses: tj-actions/verify-changed-files@v20
         id: verify-changed-files

From 23faf883dfb576a2fd8a0e7cd9c33ae81dac55bb Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 18:18:29 +0200
Subject: [PATCH 45/49] fix lint

---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 504abdd405..aee08c3ad3 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,10 +7,10 @@ on:
       - '.github/workflows/lint.yml'  # if lint workflow change
       - 'dev-requirements.txt'  # if dev-requirements.txt change
       - 'setup.cfg'   # if lint tools configuration change
+env:
+  VAR_DIR: /home/runner/work/Geotrek-admin/Geotrek-admin/var
 
 jobs:
-  env:
-    VAR_DIR: /home/runner/work/Geotrek-admin/Geotrek-admin/var
   migrations:
     name: Checking SRID in migrations files
     runs-on: ubuntu-latest

From ee2d0eb9fae095059db02750b73eb2411747f02f Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 18:25:09 +0200
Subject: [PATCH 46/49] fix lint

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index aee08c3ad3..bb935f0038 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -53,6 +53,7 @@ jobs:
       - name: Check translations
         run: |
           ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
+          ENV=dev ./manage.py compilemessages
           ls -als
 
       - uses: tj-actions/verify-changed-files@v20

From 496cf2262e78fa193cfd4c62770655873af9883f Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 18:28:49 +0200
Subject: [PATCH 47/49] fix lint

---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index bb935f0038..24ac8332c2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,6 +9,7 @@ on:
       - 'setup.cfg'   # if lint tools configuration change
 env:
   VAR_DIR: /home/runner/work/Geotrek-admin/Geotrek-admin/var
+  ENV: dev
 
 jobs:
   migrations:

From c09ae9cfc7b7198e9533bee743129f28c0d2e857 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 18:33:09 +0200
Subject: [PATCH 48/49] fix lint

---
 .github/workflows/lint.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 24ac8332c2..c340e73491 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -53,8 +53,8 @@ jobs:
 
       - name: Check translations
         run: |
-          ENV=dev ./manage.py makemessages -a --no-location --no-obsolete
-          ENV=dev ./manage.py compilemessages
+          ./manage.py makemessages -a # --no-location --no-obsolete
+          ./manage.py compilemessages
           ls -als
 
       - uses: tj-actions/verify-changed-files@v20

From 984d12e332ba6dae8a02be9ff128533e613a2878 Mon Sep 17 00:00:00 2001
From: J-E Castagnede <j.e.castagnede@gmail.com>
Date: Wed, 2 Oct 2024 18:36:55 +0200
Subject: [PATCH 49/49] fix lint

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c340e73491..c526c531fd 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -53,7 +53,7 @@ jobs:
 
       - name: Check translations
         run: |
-          ./manage.py makemessages -a # --no-location --no-obsolete
+          ./manage.py makemessages -a --no-location --no-obsolete -v 3
           ./manage.py compilemessages
           ls -als