github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-06 10:13:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get translations from fallback catalogues (#1961)

Browse Source
This commit is contained in:
Julian Berger 2020-01-17 23:37:50 +01:00 committed by Franz Liedke
parent 152951f81b
commit d0a23b756c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/core/src/Frontend/AddTranslations.php
View File

@ -53,7 +53,12 @@ class AddTranslations
private function getTranslations(string $locale) private function getTranslations(string $locale)
{ {
$translations = $this->locales->getTranslator()->getCatalogue($locale)->all('messages'); $catalogue = $this->locales->getTranslator()->getCatalogue($locale);
$translations = $catalogue->all('messages');
while ($catalogue = $catalogue->getFallbackCatalogue()) {
$translations = array_replace($catalogue->all('messages'), $translations);
}
return Arr::only( return Arr::only(
$translations, $translations,