fix: #139

Author: tobimori

classes/Meta.php

@@ -49,10 +49,10 @@ public function __construct(Page $page, ?Language $lang = null)
 	 */
 	public static function normalizeLocale(string $locale, string $separator = '-'): string
 	{
-		// Remove encoding suffix if present (e.g., '.UTF-8')
-		$locale = Str::before($locale, '.');
+		// encoding suffix if present (e.g., '.UTF-8')
+		$locale = Str::contains($locale, '.') ? Str::before($locale, '.') : $locale;
 
-		// Replace both underscores and hyphens with the desired separator
+		// target both underscores and hyphens
 		$locale = Str::replace($locale, '_', $separator);
 		$locale = Str::replace($locale, '-', $separator);
 

composer.json

@@ -2,7 +2,7 @@
 	"name": "tobimori/kirby-seo",
 	"description": "The ultimate Kirby SEO toolkit",
 	"type": "kirby-plugin",
-	"version": "2.0.0-alpha.1",
+	"version": "2.0.0-alpha.2",
 	"license": "proprietary",
 	"homepage": "https://github.com/tobimori/kirby-seo#readme",
 	"authors": [

composer.lock

@@ -2,13 +2,14 @@
 
 use Kirby\Http\Url;
 use Kirby\Toolkit\Str;
+use tobimori\Seo\Meta;
 use tobimori\Seo\SchemaSingleton;
 use tobimori\Seo\Seo;
 
 return [
 	'schema' => fn ($type) => SchemaSingleton::getInstance($type),
 	'schemas' => fn () => SchemaSingleton::getInstances(),
-	'lang' => fn () => Str::replace(Seo::option('default.lang')($this->homePage()), '_', '-'),
+	'lang' => fn () => Meta::normalizeLocale(Seo::option('default.locale', args: [$this->homePage()]), '-'),
 	'canonicalFor' => function (string $url, bool $useRootUrl = false) {
 		// Determine the base URL
 		$base = Seo::option('canonical.base', Seo::option('canonicalBase'));

config/site-methods.php

@@ -1,32 +1,34 @@
-<?php return array(
-    'root' => array(
-        'name' => 'tobimori/kirby-seo',
-        'pretty_version' => '2.0.0-alpha.1',
-        'version' => '2.0.0.0-alpha1',
-        'reference' => null,
-        'type' => 'kirby-plugin',
-        'install_path' => __DIR__ . '/../../',
-        'aliases' => array(),
-        'dev' => false,
-    ),
-    'versions' => array(
-        'getkirby/composer-installer' => array(
-            'pretty_version' => '1.2.1',
-            'version' => '1.2.1.0',
-            'reference' => 'c98ece30bfba45be7ce457e1102d1b169d922f3d',
-            'type' => 'composer-plugin',
-            'install_path' => __DIR__ . '/../getkirby/composer-installer',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-        'tobimori/kirby-seo' => array(
-            'pretty_version' => '2.0.0-alpha.1',
-            'version' => '2.0.0.0-alpha1',
-            'reference' => null,
-            'type' => 'kirby-plugin',
-            'install_path' => __DIR__ . '/../../',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-    ),
+<?php
+
+return array(
+	'root' => array(
+		'name' => 'tobimori/kirby-seo',
+		'pretty_version' => '2.0.0-alpha.2',
+		'version' => '2.0.0.0-alpha2',
+		'reference' => null,
+		'type' => 'kirby-plugin',
+		'install_path' => __DIR__ . '/../../',
+		'aliases' => array(),
+		'dev' => false,
+	),
+	'versions' => array(
+		'getkirby/composer-installer' => array(
+			'pretty_version' => '1.2.1',
+			'version' => '1.2.1.0',
+			'reference' => 'c98ece30bfba45be7ce457e1102d1b169d922f3d',
+			'type' => 'composer-plugin',
+			'install_path' => __DIR__ . '/../getkirby/composer-installer',
+			'aliases' => array(),
+			'dev_requirement' => false,
+		),
+		'tobimori/kirby-seo' => array(
+			'pretty_version' => '2.0.0-alpha.2',
+			'version' => '2.0.0.0-alpha2',
+			'reference' => null,
+			'type' => 'kirby-plugin',
+			'install_path' => __DIR__ . '/../../',
+			'aliases' => array(),
+			'dev_requirement' => false,
+		),
+	),
 );