Added i18n support

This commit is contained in:
MakingCG
2020-04-01 18:44:47 +02:00
parent 182091c21a
commit 8633650f82
52 changed files with 861 additions and 272 deletions
+2 -2
View File
@@ -31,7 +31,7 @@ class FileManagerFile extends Model
*/
public function getCreatedAtAttribute()
{
return Carbon::create($this->attributes['created_at'])->format('j M Y \a\t H:i');;
return format_date($this->attributes['created_at'], __('vuefilemanager.time'));
}
/**
@@ -43,7 +43,7 @@ class FileManagerFile extends Model
{
if (! $this->attributes['deleted_at']) return null;
return Carbon::create($this->attributes['deleted_at'])->format('j M Y at H:i');
return format_date($this->attributes['deleted_at'], __('vuefilemanager.time'));
}
/**
+2 -2
View File
@@ -79,7 +79,7 @@ class FileManagerFolder extends Model
*/
public function getCreatedAtAttribute()
{
return Carbon::create($this->attributes['created_at'])->format('j M Y \a\t H:i');
return format_date($this->attributes['created_at'], __('vuefilemanager.time'));
}
/**
@@ -91,7 +91,7 @@ class FileManagerFolder extends Model
{
if (! $this->attributes['deleted_at']) return null;
return Carbon::create($this->attributes['deleted_at'])->format('j M Y \a\t H:i');
return format_date($this->attributes['deleted_at'], __('vuefilemanager.time'));
}
/**
+1 -1
View File
@@ -43,7 +43,7 @@ class AuthController extends Controller
];
// Abort with 404, user not found
return abort('404', 'We can\'t find a user with that e-mail address.');
return abort('404', __('vuefilemanager.user_not_fount'));
}
/**
* Login user
@@ -408,8 +408,10 @@ class FileManagerController extends Controller
public function upload_item(Request $request)
{
// Check if user can upload
if (config('vuefilemanager.limit_storage_by_capacity') && user_storage_percentage() >= 100)
if (config('vuefilemanager.limit_storage_by_capacity') && user_storage_percentage() >= 100) {
abort(423, 'You exceed your storage limit!');
}
// Validate request
$validator = Validator::make($request->all(), [
@@ -33,7 +33,6 @@ class UserAccountController extends Controller
'user' => $user->only(['name', 'email', 'avatar']),
'favourites' => $user->favourites->makeHidden(['pivot']),
'latest_uploads' => $user->latest_uploads->makeHidden(['user_id', 'basename']),
'storage' => [
'used' => Metric::bytes($user->used_capacity)->format(),
'capacity' => format_gigabytes(config('vuefilemanager.user_storage_capacity')),
@@ -57,7 +56,7 @@ class UserAccountController extends Controller
return [
[
'unique_id' => 0,
'name' => 'Home',
'name' => __('vuefilemanager.home'),
'location' => 'base',
'folders' => $folders,
]
+15 -1
View File
@@ -1,6 +1,7 @@
<?php
use ByteUnits\Metric;
use Carbon\Carbon;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Intervention\Image\ImageManagerStatic as Image;
@@ -54,7 +55,6 @@ function check_directory($directory)
*/
function make_single_input($request)
{
// Create container
$data = [];
@@ -157,4 +157,18 @@ function filter_folders_ids($folders)
$folder_unique_ids = recursiveFind($folders->toArray(), 'unique_id');
return appeared_once($folder_unique_ids);
}
/**
* Format localized date
*
* @param $date
* @param string $format
* @return string
*/
function format_date($date, $format = '%d. %B. %Y, %H:%M')
{
$start = Carbon::parse($date);
return $start->formatLocalized($format);
}
+8 -1
View File
@@ -2,6 +2,8 @@
namespace App\Providers;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider;
class AppServiceProvider extends ServiceProvider
@@ -23,6 +25,11 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
//
Schema::defaultStringLength(191);
$get_time_locale = App::getLocale() . '_' . mb_strtoupper(App::getLocale());
// Set locale for carbon dates
setlocale(LC_TIME, $get_time_locale);
}
}