Dan Brown

Fixed carbon locale setting

1 <?php namespace BookStack\Providers; 1 <?php namespace BookStack\Providers;
2 2
3 +use Carbon\Carbon;
3 use Illuminate\Support\ServiceProvider; 4 use Illuminate\Support\ServiceProvider;
5 +use Validator;
4 6
5 class AppServiceProvider extends ServiceProvider 7 class AppServiceProvider extends ServiceProvider
6 { 8 {
...@@ -12,12 +14,12 @@ class AppServiceProvider extends ServiceProvider ...@@ -12,12 +14,12 @@ class AppServiceProvider extends ServiceProvider
12 public function boot() 14 public function boot()
13 { 15 {
14 // Custom validation methods 16 // Custom validation methods
15 - \Validator::extend('is_image', function($attribute, $value, $parameters, $validator) { 17 + Validator::extend('is_image', function($attribute, $value, $parameters, $validator) {
16 $imageMimes = ['image/png', 'image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/tiff', 'image/webp']; 18 $imageMimes = ['image/png', 'image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/tiff', 'image/webp'];
17 return in_array($value->getMimeType(), $imageMimes); 19 return in_array($value->getMimeType(), $imageMimes);
18 }); 20 });
19 - Carbon::setLocale(Config::get('app.locale'));
20 21
22 + Carbon::setLocale(config('app.locale'));
21 } 23 }
22 24
23 /** 25 /**
......