Merge pull request #172 from City-of-Helsinki/UHF-9708

UHF-9708: Add type argument to getCurrentOrFallbackLanguage
City-of-Helsinki · Jun 25, 2024 · 4165398 · 4165398
2 parents bb8b9a1 + 9be6c51
commit 4165398
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Language/DefaultLanguageResolver.php b/src/Language/DefaultLanguageResolver.php
@@ -4,6 +4,7 @@
 
 namespace Drupal\helfi_api_base\Language;
 
+use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
@@ -78,11 +79,14 @@ public function isAltLanguage(string $langcode = NULL): bool {
   /**
    * Get current or fallback langcode.
    *
+   * @param string $type
+   *   (optional) The language type.
+   *
    * @return string
    *   Current or fallback language ID if current doesn't have full support.
    */
-  public function getCurrentOrFallbackLanguage(): string {
-    $langcode = $this->languageManager->getCurrentLanguage()->getId();
+  public function getCurrentOrFallbackLanguage(string $type = LanguageInterface::TYPE_INTERFACE): string {
+    $langcode = $this->languageManager->getCurrentLanguage($type)->getId();
     if ($this->isAltLanguage($langcode)) {
       return $this->getFallbackLanguage();
     }