From 428b2f07e8b6e841dded62f9e4a15dd682c4e788 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 19 Dec 2018 22:07:20 +0100
Subject: [PATCH] Locale: Don't resolve manager just to configure it

Refs #1578.
---
 .../core/src/Locale/LocaleServiceProvider.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/framework/core/src/Locale/LocaleServiceProvider.php b/framework/core/src/Locale/LocaleServiceProvider.php
index 87150f848..5e10ed770 100644
--- a/framework/core/src/Locale/LocaleServiceProvider.php
+++ b/framework/core/src/Locale/LocaleServiceProvider.php
@@ -26,14 +26,8 @@ class LocaleServiceProvider extends AbstractServiceProvider
      */
     public function boot(Dispatcher $events)
     {
-        $locales = $this->app->make('flarum.locales');
-
-        $locales->addLocale($this->getDefaultLocale(), 'Default');
-
-        $events->dispatch(new ConfigureLocales($locales));
-
-        $events->listen(ClearingCache::class, function () use ($locales) {
-            $locales->clearCache();
+        $events->listen(ClearingCache::class, function () {
+            $this->app->make('flarum.locales')->clearCache();
         });
     }
 
@@ -43,10 +37,16 @@ class LocaleServiceProvider extends AbstractServiceProvider
     public function register()
     {
         $this->app->singleton(LocaleManager::class, function () {
-            return new LocaleManager(
+            $locales = new LocaleManager(
                 $this->app->make('translator'),
                 $this->getCacheDir()
             );
+
+            $locales->addLocale($this->getDefaultLocale(), 'Default');
+
+            event(new ConfigureLocales($locales));
+
+            return $locales;
         });
 
         $this->app->alias(LocaleManager::class, 'flarum.locales');