mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-28 11:00:39 +00:00
add set language as default, Fix console error in SharedPage
This commit is contained in:
@@ -390,6 +390,10 @@ class SetupWizardController extends Controller
|
||||
'name' => 'storage_default',
|
||||
'value' => $request->defaultStorage ? $request->defaultStorage : 5,
|
||||
],
|
||||
[
|
||||
'name' => 'language',
|
||||
'value' => 'en'
|
||||
]
|
||||
]);
|
||||
|
||||
// Store options
|
||||
@@ -490,7 +494,7 @@ class SetupWizardController extends Controller
|
||||
|
||||
$strings = $language_strings->map(function ($value , $key) use($language) {
|
||||
|
||||
return [
|
||||
return [
|
||||
'language_id' => $language->id,
|
||||
'key' => $key,
|
||||
'lang' => $language->locale,
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
|
||||
namespace App\Http\Controllers\Language;
|
||||
|
||||
use App\Setting;
|
||||
use App\Language;
|
||||
use App\LanguageString;
|
||||
|
||||
|
||||
use App\Http\Tools\Demo;
|
||||
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use App\Http\Controllers\Controller;
|
||||
@@ -31,22 +32,23 @@ class LanguageController extends Controller
|
||||
* Get all language strings
|
||||
*
|
||||
* @param Language $language
|
||||
* @return string
|
||||
* @return Collection
|
||||
*/
|
||||
public function get_language_strings(Language $language)
|
||||
{
|
||||
|
||||
// $lang = Language::whereId($language->id);
|
||||
$language_setting = Setting::whereName('language')->first()->value;
|
||||
|
||||
$strings = $language->with('languageStrings')->first();
|
||||
$lang = Language::whereId($language->id);
|
||||
|
||||
// dd($strings);
|
||||
$strings = $lang->with('languageStrings')->first();
|
||||
|
||||
// dd($language);
|
||||
|
||||
$license = get_setting('license') === 'Extended' ? 'extended' : 'regular';
|
||||
|
||||
$default_strings = collect(config('language_strings.' . $license));
|
||||
|
||||
return collect(['translated_strings' => $strings, 'default_strings' => $default_strings]);
|
||||
return collect(['language_setting' => $language_setting, 'translated_strings' => $strings, 'default_strings' => $default_strings]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user