Merge branch '4.6'

# Conflicts:
#	src/lib/Form/Type/ChoiceList/Loader/SiteAccessChoiceLoader.php

Author: barw4

src/lib/Form/Type/ChoiceList/Loader/SiteAccessChoiceLoader.php

@@ -23,14 +23,18 @@ class SiteAccessChoiceLoader implements ChoiceLoaderInterface
 
     private SiteAccessNameGeneratorInterface $siteAccessNameGenerator;
 
+    private ?string $languageCode;
+
     public function __construct(
         SiteaccessResolverInterface $nonAdminSiteAccessResolver,
         SiteAccessNameGeneratorInterface $siteAccessNameGenerator,
-        ?Location $location = null
+        ?Location $location = null,
+        ?string $languageCode = null
     ) {
         $this->nonAdminSiteAccessResolver = $nonAdminSiteAccessResolver;
         $this->location = $location;
         $this->siteAccessNameGenerator = $siteAccessNameGenerator;
+        $this->languageCode = $languageCode;
     }
 
     /**
@@ -40,7 +44,11 @@ public function getChoiceList(): array
     {
         $siteAccesses = $this->location === null
             ? $this->nonAdminSiteAccessResolver->getSiteAccessesList()
-            : $this->nonAdminSiteAccessResolver->getSiteAccessesListForLocation(($this->location));
+            : $this->nonAdminSiteAccessResolver->getSiteAccessesListForLocation(
+                $this->location,
+                null,
+                $this->languageCode,
+            );
 
         $data = [];
         foreach ($siteAccesses as $siteAccess) {

src/lib/Form/Type/Preview/SiteAccessChoiceType.php

@@ -51,7 +51,8 @@ public function configureOptions(OptionsResolver $resolver): void
                             new SiteAccessChoiceLoader(
                                 $this->siteAccessResolver,
                                 $this->siteAccessNameGenerator,
-                                $options['location']
+                                $options['location'],
+                                $options['languageCode'],
                             ),
                             $this->urlGenerator,
                             $options['content']->id,

src/lib/Menu/ContentRightSidebarBuilder.php

@@ -476,7 +476,7 @@ private function getContentPreviewItem(
         array $options
     ): ItemInterface {
         $versionNo = $content->getVersionInfo()->versionNo;
-        $languageCode = $content->contentInfo->mainLanguageCode;
+        $languageCode = $content->getDefaultLanguageCode();
 
         $siteAccesses = $this->siteaccessResolver->getSiteAccessesListForLocation(
             $location,