Merge remote-tracking branch 'origin/v2' into oasis

# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php

app/Models/File.php

@@ -69,7 +69,7 @@ class File extends Model
      */
     public function getCreatedAtAttribute()
     {
-        return format_date(set_time_by_user_timezone($this->attributes['created_at']), __('vuefilemanager.time'));
+        return format_date(set_time_by_user_timezone($this->attributes['created_at']), __t('time'));
     }
 
     /**
@@ -81,7 +81,7 @@ class File extends Model
     {
         if (!$this->attributes['deleted_at']) return null;
 
-        return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __('vuefilemanager.time'));
+        return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __t('time'));
     }
 
     /**

app/Models/Folder.php

@@ -104,7 +104,7 @@ class Folder extends Model
      */
     public function getCreatedAtAttribute()
     {
-        return format_date(set_time_by_user_timezone($this->attributes['created_at']), __('vuefilemanager.time'));
+        return format_date(set_time_by_user_timezone($this->attributes['created_at']), __t('time'));
     }
 
     /**
@@ -116,7 +116,7 @@ class Folder extends Model
     {
         if (!$this->attributes['deleted_at']) return null;
 
-        return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __('vuefilemanager.time'));
+        return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __t('time'));
     }
 
     /**

app/Models/Language.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Models;
+
+use App\Services\HelperService;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Eloquent\Model;
+use Kyslik\ColumnSortable\Sortable;
+
+/**
+ * @method static whereLocale(string $param)
+ */
+class Language extends Model
+{
+    use Sortable;
+
+    public $sortable = [
+        'created_at',
+    ];
+
+    protected $guarded = [
+        'id'
+    ];
+
+    protected $keyType = 'string';
+
+    protected $primaryKey = 'id';
+
+    public $incrementing = false;
+
+    public function languageTranslations()
+    {
+        return $this->hasMany(LanguageTranslation::class, 'lang', 'locale');
+    }
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($language) {
+            $language->id = Str::uuid();
+
+            resolve(HelperService::class)
+                ->create_default_language_translations(
+                    get_setting('license') ?? 'extended', $language->locale
+                );
+        });
+
+        static::updating(function ($language) {
+            cache()->forget("language-translations-$language->locale");
+        });
+
+        static::deleting(function ($language) {
+            DB::table('language_translations')
+                ->whereLang($language->locale)
+                ->delete();
+
+            cache()->forget("language-translations-$language->locale");
+        });
+    }
+}

app/Models/LanguageTranslation.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LanguageTranslation extends Model
+{
+    public $timestamps = false;
+
+    public $primaryKey = null;
+
+    public $incrementing = false;
+
+    protected $fillable = [
+        'value'
+    ];
+}

app/Models/Setting.php

@@ -5,6 +5,9 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @method static whereName(string $string)
+ */
 class Setting extends Model
 {
     use HasFactory;

app/Models/User.php

@@ -171,7 +171,7 @@ class User extends Authenticatable
      */
     public function record_upload($file_size)
     {
-        $now = Carbon::now();
+        $now = now();
 
         $record = Traffic::whereYear('created_at', '=', $now->year)
             ->whereMonth('created_at', '=', $now->month)
@@ -191,7 +191,7 @@ class User extends Authenticatable
      */
     public function record_download($file_size)
     {
-        $now = Carbon::now();
+        $now = now();
 
         $record = Traffic::whereYear('created_at', '=', $now->year)
             ->whereMonth('created_at', '=', $now->month)