From: Dan Brown <redacted>
Date: Sat, 31 Dec 2016 14:38:04 +0000 (+0000)
Subject: Fixed carbon locale setting
X-Git-Tag: v0.14.0~1^2~25
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0eb90cb3b693c9041d32bf24523b318ae4c4a9ae?ds=inline

Fixed carbon locale setting
---

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 1fbc1c44c..66f40569a 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,6 +1,8 @@
 <?php namespace BookStack\Providers;
 
+use Carbon\Carbon;
 use Illuminate\Support\ServiceProvider;
+use Validator;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -12,12 +14,12 @@ class AppServiceProvider extends ServiceProvider
     public function boot()
     {
         // Custom validation methods
-        \Validator::extend('is_image', function($attribute, $value, $parameters, $validator) {
+        Validator::extend('is_image', function($attribute, $value, $parameters, $validator) {
             $imageMimes = ['image/png', 'image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/tiff', 'image/webp'];
             return in_array($value->getMimeType(), $imageMimes);
         });
-        Carbon::setLocale(Config::get('app.locale'));
 
+        Carbon::setLocale(config('app.locale'));
     }
 
     /**