colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed carbon locale setting

This commit is contained in:
Dan Brown 2016-12-31 14:38:04 +00:00
parent 9fe158b78a
commit 0eb90cb3b6
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Providers/AppServiceProvider.php
View File

@ -1,6 +1,8 @@
<?php namespace BookStack\Providers; <?php namespace BookStack\Providers;
use Carbon\Carbon;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Validator;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
{ {
@ -12,12 +14,12 @@ class AppServiceProvider extends ServiceProvider
public function boot() public function boot()
{ {
// Custom validation methods // 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']; $imageMimes = ['image/png', 'image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/tiff', 'image/webp'];
return in_array($value->getMimeType(), $imageMimes); return in_array($value->getMimeType(), $imageMimes);
}); });
Carbon::setLocale(Config::get('app.locale'));
Carbon::setLocale(config('app.locale'));
} }
/** /**