Bugfix: Refactor getPropertyGroup method to improve locale handling for PropertyGroupCollection and PropertyDataGroupDto

Author: cklei-carly

src/Base/Dtos/Concerns/HasPropertyGroup.php

@@ -25,8 +25,16 @@ public function getPropertyGroup(string $key)
         }
 
         $result = $this->propertyData->get($key, null);
-        if ($result && $result instanceof PropertyGroupCollection) {
-            $result->setFallbackLocale($this->getFallbackLocale());
+        
+        if ($result) {
+            
+            $locale = $this->getLocale() ?? $this->getFallbackLocale();
+
+            if ($result instanceof PropertyGroupCollection
+                || $result instanceof PropertyDataGroupDto
+            ) {
+                $result = $result->setFallbackLocale($locale);
+            }
         }
 
         return $result;