[4.x] Localize entry & term fields in Taxonomy Term GraphQL queries (#…

…9492)
statamic · Feb 8, 2024 · f77064c · f77064c
1 parent b1bb52b
commit f77064c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
@@ -23,6 +23,7 @@
 use Statamic\Search\Index;
 use Statamic\Search\Result;
 use Statamic\Support\Arr;
+use Statamic\Taxonomies\LocalizedTerm;
 
 class Entries extends Relationship
 {
@@ -321,7 +322,7 @@ protected function collect($value)
     public function augment($values)
     {
         $site = Site::current()->handle();
-        if (($parent = $this->field()->parent()) && $parent instanceof Localization) {
+        if (($parent = $this->field()->parent()) && ($parent instanceof Localization || $parent instanceof LocalizedTerm)) {
             $site = $parent->locale();
         }
 

diff --git a/src/Fieldtypes/Terms.php b/src/Fieldtypes/Terms.php
@@ -22,6 +22,7 @@
 use Statamic\Query\Scopes\Filters\Fields\Terms as TermsFilter;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
+use Statamic\Taxonomies\LocalizedTerm;
 
 class Terms extends Relationship
 {
@@ -111,7 +112,7 @@ public function augment($values)
         // entry, but could also be something else, like another taxonomy term.
         $parent = $this->field->parent();
 
-        $site = $parent && $parent instanceof Localization
+        $site = $parent && ($parent instanceof Localization || $parent instanceof LocalizedTerm)
             ? $parent->locale()
             : Site::current()->handle(); // Use the "current" site so this will get localized appropriately on the front-end.