Merge 575d1ce into 1db4d58

jenssegers · Sep 26, 2017 · 1af8501 · 1af8501
2 parents 1db4d58 + 575d1ce
commit 1af8501
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/DateServiceProvider.php b/src/DateServiceProvider.php
@@ -18,9 +18,15 @@ class DateServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->app['events']->listen('locale.changed', function () {
-            $this->setLocale();
-        });
+        if (version_compare(\App::version(), '5.5') >= 0) {
+            $this->app['events']->listen(LocaleUpdated::class, function() {
+                $this->setLocale();
+            });
+        } else {
+            $this->app['events']->listen('locale.changed', function () {
+                $this->setLocale();
+            });
+        }
 
         $this->setLocale();
     }