adds translation and updated rules

db/migrations/1713018113_updated_users.go

@@ -52,7 +52,7 @@ func init() {
 			settings.Set("unit", unit)
 			settings.Set("location", location)
 			settings.Set("user", user.Id)
-			settings.Set("mapFocus", "trails")
+			settings.Set("mapFocus", "location")
 			if err := dao.SaveRecord(settings); err != nil {
 				return err
 			}

db/migrations/1713034732_updated_waypoints.go

@@ -0,0 +1,38 @@
+package migrations
+
+import (
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/daos"
+	m "github.com/pocketbase/pocketbase/migrations"
+	"github.com/pocketbase/pocketbase/tools/types"
+)
+
+func init() {
+	m.Register(func(db dbx.Builder) error {
+		dao := daos.New(db);
+
+		collection, err := dao.FindCollectionByNameOrId("goeo2ubp103rzp9")
+		if err != nil {
+			return err
+		}
+
+		collection.ListRule = types.Pointer("@request.auth.id != \"\" && (@collection.trails.waypoints.id ?= id && (@collection.trails.author ?= @request.auth.id || @collection.trails.public ?= true) || author = @request.auth.id)")
+
+		collection.ViewRule = types.Pointer("@request.auth.id != \"\" && (@collection.trails.waypoints.id ?= id && (@collection.trails.author ?= @request.auth.id || @collection.trails.public ?= true) || author = @request.auth.id)")
+
+		return dao.SaveCollection(collection)
+	}, func(db dbx.Builder) error {
+		dao := daos.New(db);
+
+		collection, err := dao.FindCollectionByNameOrId("goeo2ubp103rzp9")
+		if err != nil {
+			return err
+		}
+
+		collection.ListRule = types.Pointer("@request.auth.id != \"\" && (@collection.trails.waypoints.id ?= id && (@collection.trails.author = @request.auth.id || @collection.trails.public = true) || author = @request.auth.id)")
+
+		collection.ViewRule = types.Pointer("@request.auth.id != \"\" && (@collection.trails.waypoints.id ?= id && (@collection.trails.author = @request.auth.id || @collection.trails.public = true) || author = @request.auth.id)")
+
+		return dao.SaveCollection(collection)
+	})
+}

db/migrations/1713035768_updated_comments.go

@@ -0,0 +1,50 @@
+package migrations
+
+import (
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/daos"
+	m "github.com/pocketbase/pocketbase/migrations"
+	"github.com/pocketbase/pocketbase/tools/types"
+)
+
+func init() {
+	m.Register(func(db dbx.Builder) error {
+		dao := daos.New(db);
+
+		collection, err := dao.FindCollectionByNameOrId("lf06qip3f4d11yk")
+		if err != nil {
+			return err
+		}
+
+		collection.ListRule = types.Pointer("((@request.auth.id != \"\" && trail.author = @request.auth.id) || trail.public = true) || author = @request.auth.id")
+
+		collection.ViewRule = types.Pointer("((@request.auth.id != \"\" && trail.author = @request.auth.id) || trail.public = true) || author = @request.auth.id")
+
+		collection.CreateRule = types.Pointer("@request.auth.id != \"\" && (trail.author = @request.auth.id || trail.public = true)")
+
+		collection.UpdateRule = types.Pointer("@request.auth.id = author")
+
+		collection.DeleteRule = types.Pointer("@request.auth.id = author")
+
+		return dao.SaveCollection(collection)
+	}, func(db dbx.Builder) error {
+		dao := daos.New(db);
+
+		collection, err := dao.FindCollectionByNameOrId("lf06qip3f4d11yk")
+		if err != nil {
+			return err
+		}
+
+		collection.ListRule = types.Pointer("")
+
+		collection.ViewRule = types.Pointer("")
+
+		collection.CreateRule = types.Pointer("")
+
+		collection.UpdateRule = types.Pointer("")
+
+		collection.DeleteRule = types.Pointer("")
+
+		return dao.SaveCollection(collection)
+	})
+}

web/src/lib/components/trail/trail_info_panel.svelte

@@ -31,7 +31,6 @@
     import Textarea from "../base/textarea.svelte";
     import CommentCard from "../comment/comment_card.svelte";
     import PhotoGallery from "../photo_gallery.svelte";
-    import { page } from "$app/stores";
 
     export let trail: Trail;
     export let mode: "overview" | "map" = "map";
@@ -42,7 +41,7 @@
         $_("waypoints"),
         $_("photos"),
         $_("summit-book"),
-        $_("comment", { values: { n: 2 } }),
+        ...($currentUser ? [$_("comment", { values: { n: 2 } })] : []),
     ];
 
     let map: Map;

web/src/lib/i18n/locales/de.json

@@ -52,7 +52,7 @@
   "entry": "Eintrag",
   "error-creating-user": "Fehler beim Erstellen des Nutzers",
   "error-during-login": "Fehler beim Login",
-  "error-printing-map": "",
+  "error-printing-map": "Fehler beim Drucken der Karte",
   "error-reading-file": "Fehler beim Lesen der Datei",
   "est-duration": "Gesch. Dauer",
   "explore": "Erkunden",
@@ -60,7 +60,7 @@
   "features": "Features",
   "french": "Französisch",
   "german": "Deutsch",
-  "grid": "",
+  "grid": "Gitter",
   "hero_section_0_text": "Entdecke spannende Routen, speichere deine Favoriten und erlebe die Schönheit der Natur. Finde dein nächstes Abenteuer!",
   "hero_section_1_heading": "Hier gibt es noch keine Routen",
   "hero_section_1_text": "Hier sind einige Routen, die dir gefallen könnten. Oder du wirfst einen Blick auf die vollständige Liste.",
@@ -69,7 +69,7 @@
   "hungarian": "Ungarisch",
   "icon": "Icon",
   "imperial": "Amerikanisch",
-  "include-description": "",
+  "include-description": "Beschreibung übernehmen",
   "invalid-date": "Ungültiges Datum",
   "invalid-username": "Ungültiger Nutzername",
   "language": "Sprache",
@@ -86,12 +86,12 @@
   "metric": "Metrisch",
   "moderate": "Mittel",
   "must-be-at-least-n-characters-long": "Muss mindestens {n} Zeichen lang sein",
-  "n-days-ago": "",
+  "n-days-ago": "vor {n} Tagen",
-  "n-hours-ago": "",
+  "n-hours-ago": "vor {n} Stunden",
-  "n-minutes-ago": "",
+  "n-minutes-ago": "vor {n} Minuten",
-  "n-months-ago": "",
+  "n-months-ago": "vor {n} Monaten",
-  "n-seconds-ago": "",
+  "n-seconds-ago": "vor {n} Sekunden",
-  "n-years-ago": "",
+  "n-years-ago": "vor {n} Jahren",
   "name": "Name",
   "near": "Nahe",
   "new-list": "Neue Liste",
@@ -102,14 +102,14 @@
   "not-a-valid-email-address": "Keine gültige Email-Adresse",
   "not-completed": "Nicht abgeschlossen",
   "or": "oder",
-  "orientation": "",
+  "orientation": "Ausrichtung",
-  "paper-size": "",
+  "paper-size": "Papierformat",
   "password": "Passwort",
   "photos": "Fotos",
   "pick-a-trail": "Route auswählen",
   "polish": "Polnisch",
   "portuguese": "Portugiesisch",
-  "print": "",
+  "print": "Drucken",
   "profile": "Profil",
   "public": "Öffentlich",
   "radius": "Radius",

web/src/lib/i18n/locales/fr.json

@@ -52,7 +52,7 @@
   "entry": "Entrée",
   "error-creating-user": "Erreur durant la création de l'utilisateur",
   "error-during-login": "Erreur durant la connexion",
-  "error-printing-map": "",
+  "error-printing-map": "Erreur d'impression de la carte",
   "error-reading-file": "Erreur de lecture du fichier",
   "est-duration": "Temps estimé",
   "explore": "Explorer",
@@ -60,7 +60,7 @@
   "features": "Fonctionnalités",
   "french": "Français",
   "german": "Allemand",
-  "grid": "",
+  "grid": "Grille",
   "hero_section_0_text": "Explorez des itinéraires passionnants, sauvegardez vos favoris et découvrez la beauté de la nature. Trouvez votre prochaine aventure !",
   "hero_section_1_heading": "Il semble qu'il n'y ait pas encore d'itinéraire ici.",
   "hero_section_1_text": "Voici quelques itinéraires qui pourraient vous plaire. Vous pouvez également consulter la liste complète dès maintenant.",
@@ -69,7 +69,7 @@
   "hungarian": "Hongrois",
   "icon": "Icône",
   "imperial": "Impérial",
-  "include-description": "",
+  "include-description": "Inclure la description",
   "invalid-date": "Date invalide",
   "invalid-username": "Nom d'utilisateur invalide",
   "language": "Langue",
@@ -86,12 +86,12 @@
   "metric": "Métrique",
   "moderate": "Modérer",
   "must-be-at-least-n-characters-long": "Doit être composé d'au moins {n} caractères",
-  "n-days-ago": "",
+  "n-days-ago": "il y a {n} jours",
-  "n-hours-ago": "",
+  "n-hours-ago": "il y a {n} heures",
-  "n-minutes-ago": "",
+  "n-minutes-ago": "il y a {n} minutes",
-  "n-months-ago": "",
+  "n-months-ago": "il y a {n} mois",
-  "n-seconds-ago": "",
+  "n-seconds-ago": "il y a {n} secondes",
-  "n-years-ago": "",
+  "n-years-ago": "il y a {n} ans",
   "name": "Nom",
   "near": "Proche",
   "new-list": "Nouvelle liste",
@@ -102,14 +102,14 @@
   "not-a-valid-email-address": "Adresse email invalide",
   "not-completed": "Pas terminé",
   "or": "ou",
-  "orientation": "",
+  "orientation": "Orientation",
-  "paper-size": "",
+  "paper-size": "Taille de papier",
   "password": "Mot de passe",
   "photos": "Photos",
   "pick-a-trail": "Choisir un itinéraire",
   "polish": "polonais",
   "portuguese": "Portugais",
-  "print": "",
+  "print": "Imprimer",
   "profile": "Profile",
   "public": "Publique",
   "radius": "Rayon",

web/src/lib/i18n/locales/nl.json

@@ -52,7 +52,7 @@
   "entry": "Item",
   "error-creating-user": "Het account kan niet worden aangemaakt",
   "error-during-login": "Het inloggen is mislukt",
-  "error-printing-map": "",
+  "error-printing-map": "Fout bij afdrukken van kaart",
   "error-reading-file": "Het bestand kan niet worden ingelezen",
   "est-duration": "Geschatte duur",
   "explore": "Verkennen",
@@ -60,7 +60,7 @@
   "features": "Kenmerken",
   "french": "Frans",
   "german": "Duits",
-  "grid": "",
+  "grid": "Rooster",
   "hero_section_0_text": "Verken uitdagende wandelroutes, bewaar je favoriete en ervaar de pracht van de natuur. Op naar het volgende avontuur!",
   "hero_section_1_heading": "Je hebt nog geen wandelroutes.",
   "hero_section_1_text": "Wellicht vind je deze routes interessant. Ook kun je de volledige lijst bekijken.",
@@ -69,7 +69,7 @@
   "hungarian": "Hongaars",
   "icon": "Pictogram",
   "imperial": "Imperiaal",
-  "include-description": "",
+  "include-description": "Inclusief beschrijving",
   "invalid-date": "Ongeldige datum",
   "invalid-username": "Ongeldige gebruikersnaam",
   "language": "Taal",
@@ -86,12 +86,12 @@
   "metric": "Metrisch",
   "moderate": "Gemiddeld",
   "must-be-at-least-n-characters-long": "Minimaal {n} tekens",
-  "n-days-ago": "",
+  "n-days-ago": "{n} dagen geleden",
-  "n-hours-ago": "",
+  "n-hours-ago": "{n} uuren geleden",
-  "n-minutes-ago": "",
+  "n-minutes-ago": "{n} minuten geleden",
-  "n-months-ago": "",
+  "n-months-ago": "{n} maanden geleden",
-  "n-seconds-ago": "",
+  "n-seconds-ago": "{n} seconden geleden",
-  "n-years-ago": "",
+  "n-years-ago": "{n} jaren geleden",
   "name": "Naam",
   "near": "Nabij",
   "new-list": "Nieuwe lijst",
@@ -102,14 +102,14 @@
   "not-a-valid-email-address": "Het e-mailadres is ongeldig",
   "not-completed": "Niet voltooid",
   "or": "of",
-  "orientation": "",
+  "orientation": "Oriëntatie",
-  "paper-size": "",
+  "paper-size": "Papierformaat",
   "password": "Wachtwoord",
   "photos": "Foto's",
   "pick-a-trail": "Kies een wandelroute",
   "polish": "Pools",
   "portuguese": "Portugees",
-  "print": "",
+  "print": "Afdrukken",
   "profile": "Profiel",
   "public": "Openbaar",
   "radius": "Straal",