From 7e911fc2279c778cb277365fe2c0fea3c15bb52f Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 12 Dec 2019 19:38:38 +0100
Subject: [PATCH] wip #3262 @1

---
 src/app/Magic/Menu/Item.php     | 10 +++++++++-
 src/app/Magic/Models/Locale.php |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/Magic/Menu/Item.php b/src/app/Magic/Menu/Item.php
index 2fce0a8..ed6c642 100644
--- a/src/app/Magic/Menu/Item.php
+++ b/src/app/Magic/Menu/Item.php
@@ -406,7 +406,7 @@ class Item
         if (!$domain) {
             return $href;
         }
-        return 'https://' . $domain . $href;
+        return rtrim('https://' . $domain . '/' . $href, '/');
     }
 
     public function isNavigable()
@@ -432,6 +432,9 @@ class Item
      */
     public function addChild($item)
     {
+        if ($item->getRawLocale() === '') {
+            $item->setLocale($this->getLocale());
+        }
         $this->_children[] = $item;
     }
 
@@ -586,6 +589,11 @@ class Item
         return $res;
     }
 
+    public function getRawLocale()
+    {
+        return $this->_locale;
+    }
+
     /**
      * @return string
      */
diff --git a/src/app/Magic/Models/Locale.php b/src/app/Magic/Models/Locale.php
index d321a00..5ac91d0 100644
--- a/src/app/Magic/Models/Locale.php
+++ b/src/app/Magic/Models/Locale.php
@@ -136,10 +136,10 @@ class Locale extends CubistMagicAbstractModel
     {
         if (!isset(self::$_mainDomains[$locale])) {
             $all = self::getLocalesData();
-            if (!isset($all[$locale])) {
+            if (!isset($all['locales'][$locale])) {
                 return false;
             }
-            $domains = $all[$locale]->domains;
+            $domains = $all['locales'][$locale]->domains;
             if (is_string($domains)) {
                 $domains = json_decode($domains, true);
             }
-- 
2.39.5