Fix announcements and surveys for alt languages

City-of-Helsinki · Sep 11, 2024 · 7d22bc0 · 7d22bc0
1 parent ae51b8d
commit 7d22bc0
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/...i_etusivu_entities/src/Plugin/ExternalEntities/StorageClient/EtusivuJsonApiEntityBase.php b/...i_etusivu_entities/src/Plugin/ExternalEntities/StorageClient/EtusivuJsonApiEntityBase.php
@@ -13,6 +13,7 @@
 use Drupal\external_entities\StorageClient\ExternalEntityStorageClientBase;
 use Drupal\helfi_api_base\Environment\Environment;
 use Drupal\helfi_api_base\Environment\Project;
+use Drupal\helfi_api_base\Language\DefaultLanguageResolver;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
@@ -62,6 +63,11 @@ abstract class EtusivuJsonApiEntityBase extends ExternalEntityStorageClientBase
    */
   protected CacheBackendInterface $cache;
 
+  /**
+   * Default language resolver.
+   */
+  protected DefaultLanguageResolver $defaultLanguageResolver;
+
   /**
    * {@inheritdoc}
    */
@@ -75,6 +81,7 @@ public static function create(
     $instance->client = $container->get('http_client');
     $instance->languageManager = $container->get('language_manager');
     $instance->cache = $container->get('cache.default');
+    $instance->defaultLanguageResolver = $container->get(DefaultLanguageResolver::class);
 
     /** @var \Drupal\helfi_api_base\Environment\EnvironmentResolver $environmentResolver */
     $environmentResolver = $container->get('helfi_api_base.environment_resolver');
@@ -153,6 +160,10 @@ protected function request(string $endpoint, array $parameters, string $langcode
       return [];
     }
 
+    if ($this->defaultLanguageResolver->isAltLanguage($langcode)) {
+      $langcode = $this->defaultLanguageResolver->getFallbackLanguage();
+    }
+
     $uri = vsprintf('%s/jsonapi%s?%s', [
       $this->environment->getInternalAddress($langcode),
       $endpoint,