Language editor refactoring part 2 (backend + frontend)

app/Console/Commands/SetupDevEnvironment.php

@@ -24,6 +24,7 @@ class SetupDevEnvironment extends Command
      * @var string
      */
     protected $signature = 'setup:dev';
+    protected $license = 'Regular';
 
     /**
      * The console command description.
@@ -66,7 +67,7 @@ class SetupDevEnvironment extends Command
         $this->info('Storing default settings and content...');
         $this->store_default_settings();
         $this->setup->seed_default_pages();
-        $this->setup->seed_default_settings('Extended');
+        $this->setup->seed_default_settings($this->license);
         $this->setup->seed_default_language();
 
         $this->info('Creating default admin...');
@@ -832,7 +833,7 @@ class SetupDevEnvironment extends Command
             ],
             [
                 'name'  => 'license',
-                'value' => 'Extended',
+                'value' => $this->license,
             ],
             [
                 'name'  => 'purchase_code',

app/Http/Controllers/App/AppFunctionsController.php

@@ -7,6 +7,7 @@ use App\Http\Mail\SendContactMessage;
 use App\Http\Resources\PricingCollection;
 use App\Http\Requests\PublicPages\SendContactMessageRequest;
 use App\Http\Resources\PageResource;
+use App\Models\Language;
 use App\Models\Setting;
 use App\Models\Page;
 use App\Models\Share;
@@ -184,4 +185,24 @@ class AppFunctionsController extends Controller
             ->values()
             ->all();
     }
+
+    /**
+     * Get language translations for frontend app
+     *
+     * @param $lang
+     * @return array
+     */
+    public function get_translations($lang)
+    {
+        $translations = Cache::rememberForever("language-strings-$lang", function () use ($lang) {
+
+            return Language::whereLocale($lang)
+                ->firstOrFail()
+                ->languageStrings;
+        });
+
+        return $translations->map(function ($string) {
+            return [$string->key => $string->value];
+        })->collapse();
+    }
 }

app/Http/Controllers/Auth/AuthController.php

@@ -28,7 +28,7 @@ class AuthController extends Controller
             ->first();
 
         if (! $user) {
-            return response(__('vuefilemanager.user_not_fount'), 404);
+            return response(__t('user_not_fount'), 404);
         }
 
         return [

app/Http/Controllers/Sharing/BrowseShareController.php

@@ -81,7 +81,7 @@ class BrowseShareController extends Controller
                 ->cookie('share_session', $cookie, 43200);
         }
 
-        abort(401, __('vuefilemanager.incorrect_password'));
+        abort(401, __t('incorrect_password'));
     }
 
     /**

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/Services/HelperService.php

@@ -330,9 +330,18 @@ class HelperService
      */
     function create_default_language_strings($license, $locale)
     {
-        $strings = collect(config('language_strings.' . strtolower($license)))
-            ->map(function ($value, $key) use ($locale) {
+        $translations = [
+            'extended' => collect([
+                config("language-strings.extended"),
+                config("language-strings.regular")
+            ])->collapse(),
+            'regular'  => collect(
+                config("language-strings.regular")
+            ),
+        ];
 
+        $translations = $translations[strtolower($license)]
+            ->map(function ($value, $key) use ($locale) {
                 return [
                     'lang'  => $locale,
                     'value' => $value,
@@ -340,6 +349,7 @@ class HelperService
                 ];
             })->toArray();
 
-        DB::table('language_strings')->insert($strings);
+        DB::table('language_strings')
+            ->insert($translations);
     }
 }

app/Services/SetupService.php

@@ -5,9 +5,7 @@ namespace App\Services;
 use App\Models\Language;
 use App\Models\Page;
 use App\Models\Setting;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
-use Symfony\Component\Console\Helper\Helper;
 
 class SetupService
 {