LanguageService: use english language as fallback language

andi34 · andi34 · commit 7d625bddcbaa · 2026-04-11T08:31:28.000+02:00
Change-Id: I8ee1db60a30e6c1a87c8f29039113666f050fa22
diff --git a/src/Service/LanguageService.php b/src/Service/LanguageService.php
@@ -65,7 +65,10 @@ public function translate(string $id): string
 
     public function all(): array
     {
-        return $this->translator->getCatalogue($this->locale)->all('photobooth');
+        $fallbackLang = $this->translator->getCatalogue('en')->all('photobooth');
+        $currentLang = $this->translator->getCatalogue($this->locale)->all('photobooth');
+
+        return array_replace($fallbackLang, $currentLang);
     }
 
     public static function getInstance(): self

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,10 @@ public function translate(string $id): string`
`65`	`65`
`66`	`66`	`public function all(): array`
`67`	`67`	`{`
`68`		`- return $this->translator->getCatalogue($this->locale)->all('photobooth');`
	`68`	`+ $fallbackLang = $this->translator->getCatalogue('en')->all('photobooth');`
	`69`	`+ $currentLang = $this->translator->getCatalogue($this->locale)->all('photobooth');`
	`70`	`+`
	`71`	`+ return array_replace($fallbackLang, $currentLang);`
`69`	`72`	`}`
`70`	`73`
`71`	`74`	`public static function getInstance(): self`