From be6102d37aafb37763ae9cf48fedaa5d51c23a1f Mon Sep 17 00:00:00 2001
From: Hadrien Froger <hadrien@octree.ch>
Date: Wed, 4 Sep 2024 10:49:29 +0100
Subject: [PATCH 1/2] ci: update to docusaurus official action

---
 .github/workflows/website.yml | 56 +++++++++++++++++++++++++++++------
 website/docusaurus.config.ts  |  3 +-
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 50bf56e..c2e037a 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -1,14 +1,52 @@
-name: CI
-on: [push]
+name: Deploy to GitHub Pages
+
+on:
+  push:
+    branches:
+      - main
 
 jobs:
-  deploy:
+  build:
+    name: Build Docusaurus
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
-      - uses: redkubes/docusaurus-deploy-action@v1.2
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: yarn
+
+      - name: Install dependencies
+        working-directory: website
+        run: yarn install --frozen-lockfile
+
+      - name: Build website
+        working-directory: website
+        run: yarn build
+
+      - name: Upload Build Artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          source-folder: website
-          git-user: ${{ github.actor }}
-          git-password: ${{ secrets.GITHUB_TOKEN }}
-          deployment-branch: gh-pages
\ No newline at end of file
+          path: website/build
+
+  deploy:
+    name: Deploy to GitHub Pages
+    needs: build
+
+    # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
+    permissions:
+      pages: write # to deploy to Pages
+      id-token: write # to verify the deployment originates from an appropriate source
+
+    # Deploy to the github-pages environment
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/website/docusaurus.config.ts b/website/docusaurus.config.ts
index c09a018..6f1ef79 100644
--- a/website/docusaurus.config.ts
+++ b/website/docusaurus.config.ts
@@ -12,10 +12,11 @@ const config: Config = {
   // Set the /<baseUrl>/ pathname under which your site is served
   // For GitHub pages deployment, it is often '/<projectName>/'
   baseUrl: '/',
+  trailingSlash: false,
 
   // GitHub pages deployment config.
   // If you aren't using GitHub pages, you don't need these.
-  organizationName: 'octree', // Usually your GitHub org/user name.
+  organizationName: 'octree-gva', // Usually your GitHub org/user name.
   projectName: 'decidim-decidim_geo', // Usually your repo name.
 
   onBrokenLinks: 'throw',

From e4a3646ecc0cf6de14bbddca7d12d80f343868d0 Mon Sep 17 00:00:00 2001
From: project_392_bot_492df34532e1b17fee9ba104bd0fba89 <mr-translations>
Date: Wed, 4 Sep 2024 09:51:05 +0000
Subject: [PATCH 2/2] Update translations

---
 config/locales/decidim-geo.de.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/locales/decidim-geo.de.yml b/config/locales/decidim-geo.de.yml
index c8949da..875bbdc 100644
--- a/config/locales/decidim-geo.de.yml
+++ b/config/locales/decidim-geo.de.yml
@@ -76,9 +76,9 @@ de:
         dropdown: "Bereiche"
         all: "Alle Bereiche"
       mobile:
-        open: "Open Map"
-        open_fullscreen: "Open the map in fullscreen"
-        close_fullscreen: "Close Map"
+        open: "Karte öffnen"
+        open_fullscreen: "Karte im Vollbildmodus öffnen"
+        close_fullscreen: "Karte schliessen"
       filters:
         back: "Zurück"
         button: "Filter"
@@ -90,7 +90,7 @@ de:
           only_geoencoded: "Nur kartierte Aktivität"
           only_virtual: "Nur andere Aktivität"
         time:
-          label: "By Time"
+          label: "Nach Zeit"
           all: "Alle"
           only_past: "Vergangen"
           only_active: "Aktiv"
@@ -102,7 +102,7 @@ de:
           only_assemblies: "Gremien"
           only_proposals: "Vorschläge"
           only_meetings: "Veranstaltungen"
-          only_debates: "Debates"
+          only_debates: "Debatten"
     components:
       geo:
         name: Geo