github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-02 14:15:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed alias/reference loading for translation strings

Browse Source
This commit is contained in:
Daniel Klabbers 2017-11-27 10:35:57 +01:00
parent 4c94ad5df4
commit 386416c017
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
framework/core/src/Locale/LocaleManager.php
View File

@ -11,12 +11,13 @@
namespace Flarum\Locale; namespace Flarum\Locale;
use Symfony\Component\Translation\Translator as SymfonyTranslator;
use Illuminate\Contracts\Translation\Translator;
class LocaleManager class LocaleManager
{ {
/** /**
* @var SymfonyTranslator * @var Translator
*/ */
protected $translator; protected $translator;
@ -27,9 +28,9 @@ class LocaleManager
protected $css = []; protected $css = [];
/** /**
* @param SymfonyTranslator $translator * @param Translator $translator
*/ */
public function __construct(SymfonyTranslator $translator) public function __construct(Translator $translator)
{ {
$this->translator = $translator; $this->translator = $translator;
} }

9
framework/core/src/Locale/LocaleServiceProvider.php
View File

@ -16,7 +16,6 @@ use Flarum\Foundation\AbstractServiceProvider;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Translation\Translator as TranslatorContract; use Illuminate\Contracts\Translation\Translator as TranslatorContract;
use Symfony\Component\Translation\MessageSelector; use Symfony\Component\Translation\MessageSelector;
use Symfony\Component\Translation\Translator;
use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Translation\TranslatorInterface;
class LocaleServiceProvider extends AbstractServiceProvider class LocaleServiceProvider extends AbstractServiceProvider
@ -42,10 +41,8 @@ class LocaleServiceProvider extends AbstractServiceProvider
$this->app->alias(LocaleManager::class, 'flarum.localeManager'); $this->app->alias(LocaleManager::class, 'flarum.localeManager');
$this->app->singleton('translator', function () { $this->app->singleton('translator', function () {
$defaultLocale = $this->getDefaultLocale(); $translator = new Translator($this->getDefaultLocale(), new MessageSelector());
$translator->setFallbackLocales(['en']);
$translator = new Translator($defaultLocale, new MessageSelector());
$translator->setFallbackLocales([$defaultLocale, 'en']);
$translator->addLoader('prefixed_yaml', new PrefixedYamlFileLoader()); $translator->addLoader('prefixed_yaml', new PrefixedYamlFileLoader());
return $translator; return $translator;
@ -55,7 +52,7 @@ class LocaleServiceProvider extends AbstractServiceProvider
$this->app->alias('translator', TranslatorContract::class); $this->app->alias('translator', TranslatorContract::class);
} }
private function getDefaultLocale() private function getDefaultLocale(): string
{ {
return $this->app->isInstalled() && $this->app->isUpToDate() return $this->app->isInstalled() && $this->app->isUpToDate()
? $this->app->make('flarum.settings')->get('default_locale', 'en') ? $this->app->make('flarum.settings')->get('default_locale', 'en')

1
framework/core/src/Locale/Translator.php
View File

@ -29,7 +29,6 @@ class Translator extends BaseTranslator implements TranslatorContract
} else { } else {
$this->assertValidLocale($locale); $this->assertValidLocale($locale);
} }
$parse = ! isset($this->catalogues[$locale]); $parse = ! isset($this->catalogues[$locale]);
$catalogue = parent::getCatalogue($locale); $catalogue = parent::getCatalogue($locale);