FIX: Source locale indicator correction.

tractorcow-farm · Apr 5, 2024 · b238283 · b238283
1 parent 7bf314a
commit b238283
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/Extension/FluentExtension.php b/src/Extension/FluentExtension.php
@@ -24,7 +24,6 @@
 use SilverStripe\ORM\Queries\SQLConditionGroup;
 use SilverStripe\ORM\Queries\SQLSelect;
 use SilverStripe\ORM\ValidationException;
-use SilverStripe\Security\Permission;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\HTML;
 use TractorCow\Fluent\Extension\Traits\FluentObjectTrait;
@@ -48,6 +47,7 @@
  *
  * @template T of DataObject
  * @extends DataExtension<T&static>
+ * @property DataObject|$this $owner
  */
 class FluentExtension extends DataExtension
 {
@@ -582,11 +582,11 @@ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
 
             // Apply substitutions
             $localisedPredicate = str_replace($conditionSearch, $conditionReplace, $predicate);
-            
+
             if (empty($localisedPredicate)) {
                 continue;
             }
-            
+
             $where[$index] = [
                 $localisedPredicate => $parameters
             ];
@@ -965,19 +965,27 @@ protected function getRecordLocale()
         return Locale::getCurrentLocale();
     }
 
-
     /**
      * Returns the source locale that will display the content for this record
      *
      * @return Locale|null
      */
-    public function getSourceLocale()
+    public function getSourceLocale(): ?Locale
     {
-        $sourceLocale = $this->owner->getField('SourceLocale');
+        $owner = $this->owner;
+        $currentLocale = FluentState::singleton()->getLocale();
+
+        // We do not have a locale set, so we can't determine a source
+        if (!$currentLocale) {
+            return null;
+        }
+
+        $localeInformation = $owner->LocaleInformation($currentLocale);
+        $sourceLocale = $localeInformation->getSourceLocale();
         if ($sourceLocale) {
             return Locale::getByLocale($sourceLocale);
         }
-        return Locale::getDefault();
+        return null;
     }
 
     /**

diff --git a/tests/php/Extension/FluentVersionedExtensionTest.php b/tests/php/Extension/FluentVersionedExtensionTest.php
@@ -102,7 +102,7 @@ public function testSourceLocaleIsCurrentWhenPageExistsInIt()
                 ->setIsDomainMode(false);
 
             // Read from the locale that the page exists in already
-            /** @var Page $page */
+            /** @var Page|FluentSiteTreeExtension $page */
             $page = $this->objFromFixture(Page::class, 'home');
 
             $this->assertEquals('en_NZ', $page->getSourceLocale()->Locale);