fix #72 - update to Kirby 4.5

public/kirby/src/Uuid/FileUuid.php

@@ -3,6 +3,7 @@
 namespace Kirby\Uuid;
 
 use Generator;
+use Kirby\Cms\App;
 use Kirby\Cms\File;
 
 /**
@@ -83,4 +84,18 @@ class FileUuid extends ModelUuid
 			'filename' => $model->filename()
 		];
 	}
+
+	/**
+	 * Returns permalink url
+	 */
+	public function url(): string
+	{
+		// make sure UUID is cached because the permalink
+		// route only looks up UUIDs from cache
+		if ($this->isCached() === false) {
+			$this->populate();
+		}
+
+		return App::instance()->url() . '/@/' . static::TYPE . '/' . $this->id();
+	}
 }

public/kirby/src/Uuid/ModelUuid.php

@@ -2,8 +2,6 @@
 
 namespace Kirby\Uuid;
 
-use Kirby\Cms\App;
-
 /**
  * Base for UUIDs for models where id string
  * is stored in the content, such as pages and files
@@ -107,18 +105,4 @@ abstract class ModelUuid extends Uuid
 		// use the most basic write method to avoid object cloning
 		$this->model->writeContent($data, 'default');
 	}
-
-	/**
-	 * Returns permalink url
-	 */
-	public function url(): string
-	{
-		// make sure UUID is cached because the permalink
-		// route only looks up UUIDs from cache
-		if ($this->isCached() === false) {
-			$this->populate();
-		}
-
-		return App::instance()->url() . '/@/' . static::TYPE . '/' . $this->id();
-	}
 }

public/kirby/src/Uuid/PageUuid.php

@@ -54,4 +54,25 @@ class PageUuid extends ModelUuid
 			yield from static::index($page);
 		}
 	}
+
+	/**
+	 * Returns permalink url
+	 */
+	public function url(): string
+	{
+		// make sure UUID is cached because the permalink
+		// route only looks up UUIDs from cache
+		if ($this->isCached() === false) {
+			$this->populate();
+		}
+
+		$kirby = App::instance();
+		$url   = $kirby->url();
+
+		if ($language = $kirby->language('current')) {
+			$url .= '/' . $language->code();
+		}
+
+		return $url . '/@/' . static::TYPE . '/' . $this->id();
+	}
 }