government plan: remove trailing slash from links

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758070117,
+        "lastModified": 1773222311,
-        "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=",
+        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d",
+        "rev": "0590cd39f728e129122770c029970378a79d076a",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "type": "indirect"
       }
     },

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "Invoiceplane invoice template development shell";
 
-  inputs.nixpkgs.url = "nixpkgs/nixos-25.05";
+  inputs.nixpkgs.url = "nixpkgs/nixos-25.11";
 
   outputs =
     { self, nixpkgs, ... }@inputs:
@@ -77,7 +77,7 @@
                 };
               };
 
-              system.stateVersion = "25.05";
+              system.stateVersion = "25.11";
               services.getty.autologinUser = "root";
             }
           )

froide-govplan.nix

@@ -13,15 +13,13 @@ let
   pkg = cfg.package.overridePythonAttrs (old: {
     src = ./.;
     dependencies = old.dependencies ++ [ cfg.package.python.pkgs.mastodon-py ];
-    postInstall =
+    postInstall = old.postInstall + ''
-      old.postInstall
+      ln -s ${settingsFile} $out/${pkg.python.sitePackages}/froide_govplan/project/extra_settings.py
-      + ''
-        ln -s ${settingsFile} $out/${pkg.python.sitePackages}/froide_govplan/project/extra_settings.py
 
-        rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates
+      rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates
-        ln -sf /var/lib/froide-govplan/templates $out/${pkgs.python3.sitePackages}/froide_govplan/templates
+      ln -sf /var/lib/froide-govplan/templates $out/${pkgs.python3.sitePackages}/froide_govplan/templates
-        cp -r froide_govplan/static $out/${pkgs.python3.sitePackages}/froide_govplan/
+      cp -r froide_govplan/static $out/${pkgs.python3.sitePackages}/froide_govplan/
-      '';
+    '';
   });
 
   froide-govplan = pkgs.writeShellApplication {
@@ -169,9 +167,9 @@ in
     systemd = {
       services = {
 
-        postgresql.serviceConfig.ExecStartPost =
+        postgresql-setup.serviceConfig.ExecStartPost =
           let
-            sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" ''
+            sqlFile = pkgs.writeText "froide-govplan-postgis-setup.sql" ''
               CREATE EXTENSION IF NOT EXISTS postgis;
             '';
           in
@@ -190,49 +188,51 @@ in
             Group = "govplan";
           };
           after = [
-            "postgresql.service"
+            "postgresql.target"
             "network.target"
             "systemd-tmpfiles-setup.service"
           ];
           wantedBy = [ "multi-user.target" ];
-          environment =
+          environment = {
-            {
+            PYTHONPATH = pkg.python.pkgs.makePythonPath (
-              PYTHONPATH = pkg.python.pkgs.makePythonPath (with pkg.python.pkgs; [
+              with pkg.python.pkgs;
+              [
 
-    bleach
+                bleach
-    django-admin-sortable2
+                django-admin-sortable2
-    django-cms
+                django-cms
-    django-filer
+                django-filer
-    django-mfa3
+                django-mfa3
-    django-mptt
+                django-mptt
-    django-oauth-toolkit
+                django-oauth-toolkit
-    django-sekizai
+                django-sekizai
-    django-tinymce
+                django-tinymce
-    django-treebeard
+                django-treebeard
-    djangocms-alias
+                djangocms-alias
-    # Downgrade to last working version
+                # Downgrade to last working version
-    (toPythonModule (
+                (toPythonModule (
-      pkgs.froide.overridePythonAttrs (prev: {
+                  pkgs.froide.overridePythonAttrs (prev: {
-        nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
+                    nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
-        postBuild = "";
+                    postBuild = "";
-        doCheck = false;
+                    doCheck = false;
-        pnpmDeps = null;
+                    pnpmDeps = null;
-        src = prev.src.override {
+                    src = prev.src.override {
-          rev = "a78a4054f9f37b0a5109a6d8cfbbda742f86a8ca";
+                      rev = "a78a4054f9f37b0a5109a6d8cfbbda742f86a8ca";
-          hash = "sha256-gtOssbsVf3nG+pmLPgvh4685vHh2x+jlXiTjU+JhQa8=";
+                      hash = "sha256-gtOssbsVf3nG+pmLPgvh4685vHh2x+jlXiTjU+JhQa8=";
-        };
+                    };
-      })
+                  })
-    ))
+                ))
-    psycopg
+                psycopg
-	      mastodon-py
+                mastodon-py
-	      (toPythonModule (pkg))
+                (toPythonModule (pkg))
-	      ]);
+              ]
-              GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
+            );
-              GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
+            GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
-            }
+            GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
-            // lib.optionalAttrs (cfg.secretKeyFile != null) {
+          }
-              SECRET_KEY_FILE = cfg.secretKeyFile;
+          // lib.optionalAttrs (cfg.secretKeyFile != null) {
-            };
+            SECRET_KEY_FILE = cfg.secretKeyFile;
+          };
           preStart = ''
             # Auto-migrate on first run or if the package has changed
             versionFile="${cfg.dataDir}/src-version"

froide_govplan/signals.py

@@ -2,17 +2,21 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.conf import settings
 from django.db import transaction
-from mastodon import Mastodon
 from .models import GovernmentPlanUpdate, GovernmentPlan
 import re
 import html
 
+if not settings.DEBUG:
+    from mastodon import Mastodon
+
 def strip_html_tags(text):
     tag_re = re.compile(r'<[^>]+>')
     plain_text = tag_re.sub('', text)
     return html.unescape(plain_text)
 
 def post_to_mastodon(text):
+    if settings.DEBUG:
+        return
     mastodon = Mastodon(
         access_token=settings.MASTODON_ACCESS_TOKEN,
         api_base_url=settings.MASTODON_API_BASE_URL

froide_govplan/urls.py

@@ -29,6 +29,10 @@ urlpatterns = [
     path(
         pgettext_lazy("url part", "<slug:gov>/plan/<slug:plan>/"),
         GovPlanDetailView.as_view(),
+    ),
+    path(
+        pgettext_lazy("url part", "<slug:gov>/plan/<slug:plan>"),
+        GovPlanDetailView.as_view(),
         name="plan",
     ),
     path(
@@ -41,9 +45,17 @@ urlpatterns = [
         GovPlanProposeUpdateView.as_view(),
         name="propose_planupdate",
     ),
+    path(
+        pgettext_lazy("url part", "<slug:gov>/vorhaben/<slug:plan>"),
+        GovPlanDetailView.as_view(),
+    ),
     path(
         pgettext_lazy("url part", "<slug:gov>/<slug:section>/"),
         GovPlanSectionDetailView.as_view(),
+    ),
+    path(
+        pgettext_lazy("url part", "<slug:gov>/<slug:section>"),
+        GovPlanSectionDetailView.as_view(),
         name="section",
     ),
 ]