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

# Conflicts:
#	public/js/main.js
#	public/mix-manifest.json

app/Models/Language.php

@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Services\HelperService;
+use App\Services\LanguageService;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Model;
@@ -41,7 +41,7 @@ class Language extends Model
         static::creating(function ($language) {
             $language->id = Str::uuid();
 
-            resolve(HelperService::class)
+            resolve(LanguageService::class)
                 ->create_default_language_translations(
                     get_setting('license') ?? 'extended', $language->locale
                 );

app/Models/LanguageTranslation.php

@@ -4,6 +4,9 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @method static whereLang(string $string)
+ */
 class LanguageTranslation extends Model
 {
     public $timestamps = false;