nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-05 05:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove language_id column from language_strings table

Browse Source
This commit is contained in:
Milos Holba
2021-03-12 23:33:46 +01:00
parent 8be86183fa
commit 353180491b
7 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/General/SetupWizardController.php
-1
View File
@@ -495,7 +495,6 @@ class SetupWizardController extends Controller
$strings = $language_strings->map(function ($value , $key) use($language) {
return [
'language_id' => $language->id,
'key' => $key,
'lang' => $language->locale,
'value' => $value
app/Http/Controllers/Language/LanguageController.php
+13 -10
View File
@@ -23,7 +23,7 @@ class LanguageController extends Controller
*
* @return string
*/
public function get_languages ()
public function get_languages()
{
return Language::all();
}
@@ -48,7 +48,11 @@ class LanguageController extends Controller
$default_strings = collect(config('language_strings.' . $license));
return collect(['language_setting' => $language_setting, 'translated_strings' => $strings, 'default_strings' => $default_strings]);
return [
'language_setting' => $language_setting,
'translated_strings' => $strings,
'default_strings' => $default_strings
];
}
/**
@@ -57,14 +61,14 @@ class LanguageController extends Controller
* @param CreateLanguageRequest $request
* @return string
*/
public function create_language(CreateLanguageRequest $request)
public function create_language(CreateLanguageRequest $request)
{
// Check if is demo
if (env('APP_DEMO')) {
return Demo::response_204();
}
// Create languages & strings
// Create languages & strings
$language = Language::create([
'name' => $request->name,
'locale' => $request->locale
@@ -74,7 +78,7 @@ class LanguageController extends Controller
return $language;
}
/**
/**
* Update language
*
* @param UpdateLanguageRequest $request
@@ -102,21 +106,20 @@ class LanguageController extends Controller
* @param Language $language
* @return ResponseFactory|\Illuminate\Http\Response
*/
public function update_string(UpdateStringRequest $request,Language $language)
public function update_string(UpdateStringRequest $request, Language $language)
{
// Check if is demo
if (env('APP_DEMO')) {
return Demo::response_204();
}
LanguageString::whereLanguageIdAndKey($language->id, $request->name)
LanguageString::whereLangAndKey($language->locale, $request->name)
->update([
'language_id' => $language->id,
'key' => $request->name,
'lang' => $language->locale,
'value' => $request->value
]);
return response('Done', 204);
}
@@ -134,7 +137,7 @@ class LanguageController extends Controller
}
$language->delete();
return response('Done', 204);
}
}
app/Language.php
+1 -3
View File
@@ -38,11 +38,9 @@ class Language extends Model
$language_strings = collect(config('language_strings.' . $license));
$strings = $language_strings->map(function ($value , $key) use($language) {
return [
'language_id' => $language->id,
'key' => $key,
'lang' => $language->locale,
'value' => $value
@@ -57,6 +55,6 @@ class Language extends Model
public function languageStrings()
{
return $this->hasMany('App\LanguageString', 'language_id', 'id');
return $this->hasMany('App\LanguageString', 'lang', 'locale');
}
}
app/LanguageString.php
+1 -1
View File
@@ -12,7 +12,7 @@ class LanguageString extends Model
public $incrementing = false;
protected $fillable = ['value', 'language_id' ,'key', 'lang'];
protected $fillable = ['value' ,'key', 'lang'];
}
database/migrations/2021_01_09_152048_create_language_strings.php
-1
View File
@@ -14,7 +14,6 @@ class CreateLanguageStrings extends Migration
public function up()
{
Schema::create('language_strings', function (Blueprint $table) {
$table->uuid('language_id');
$table->string('key');
$table->longText('value');
$table->string('lang');
public/mix-manifest.json
+4 -32
View File
@@ -13,7 +13,7 @@
"/chunks/app-billings.js": "/chunks/app-billings.js?id=aac5bd51067578358164",
"/chunks/app-email.js": "/chunks/app-email.js?id=9d1631b19f6492b8cae4",
"/chunks/app-index.js": "/chunks/app-index.js?id=2dcbe307133d780b6472",
"/chunks/app-language.js": "/chunks/app-language.js?id=8cbeb2840d79d778eb3e",
"/chunks/app-language.js": "/chunks/app-language.js?id=cb21d7713de6d235ce9e",
"/chunks/app-others.js": "/chunks/app-others.js?id=44efcfb317747ff3b508",
"/chunks/app-payments.js": "/chunks/app-payments.js?id=187ecc16f9f7fbc4ccac",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=b6b0eba13665133c0a19",
@@ -76,35 +76,7 @@
"/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=10b3a108059d62d206c8",
"/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c",
"/chunks/app-language.398318a7e6c1fd968a89.hot-update.js": "/chunks/app-language.398318a7e6c1fd968a89.hot-update.js",
"/chunks/app-language.cb7758b5e05d4049f3d1.hot-update.js": "/chunks/app-language.cb7758b5e05d4049f3d1.hot-update.js",
"/chunks/app-language.821d4be4c1f1c888a902.hot-update.js": "/chunks/app-language.821d4be4c1f1c888a902.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.ee121eb97a695a19b50e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ee121eb97a695a19b50e.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.05ef932426101fb70b4b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.05ef932426101fb70b4b.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.f03df136eb103deb738e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f03df136eb103deb738e.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.2d241fca7776306cf38d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2d241fca7776306cf38d.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.3e2cb05135e0d70e89d3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3e2cb05135e0d70e89d3.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.e9977500a095b48707a0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e9977500a095b48707a0.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.ff8f45e0996df95e6b98.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ff8f45e0996df95e6b98.hot-update.js",
"/chunks/shared-page.e82a11390fdf887d31f0.hot-update.js": "/chunks/shared-page.e82a11390fdf887d31f0.hot-update.js",
"/chunks/shared-page.5c44748a89b00f5780b6.hot-update.js": "/chunks/shared-page.5c44748a89b00f5780b6.hot-update.js",
"/chunks/shared-page.96c94eaf93d40c4fc656.hot-update.js": "/chunks/shared-page.96c94eaf93d40c4fc656.hot-update.js",
"/chunks/shared-page.886ee6617c4e8bfb33f6.hot-update.js": "/chunks/shared-page.886ee6617c4e8bfb33f6.hot-update.js",
"/chunks/shared-page.b0fc16cea98b11d16ea2.hot-update.js": "/chunks/shared-page.b0fc16cea98b11d16ea2.hot-update.js",
"/chunks/shared-page.b55c620852f16c053615.hot-update.js": "/chunks/shared-page.b55c620852f16c053615.hot-update.js",
"/chunks/shared-page.de8ecf3cd5a83f2b21ec.hot-update.js": "/chunks/shared-page.de8ecf3cd5a83f2b21ec.hot-update.js",
"/chunks/shared-page.f2de09a840bc5e2796a7.hot-update.js": "/chunks/shared-page.f2de09a840bc5e2796a7.hot-update.js",
"/chunks/shared-page.bca8d95a9a291739e570.hot-update.js": "/chunks/shared-page.bca8d95a9a291739e570.hot-update.js",
"/chunks/shared-page.550416407556b21352a9.hot-update.js": "/chunks/shared-page.550416407556b21352a9.hot-update.js",
"/chunks/shared-page.ba3382ed8e662565e928.hot-update.js": "/chunks/shared-page.ba3382ed8e662565e928.hot-update.js",
"/chunks/shared-page.767f42237e27b3e750bd.hot-update.js": "/chunks/shared-page.767f42237e27b3e750bd.hot-update.js",
"/chunks/shared-page.3308679e755e73ded38e.hot-update.js": "/chunks/shared-page.3308679e755e73ded38e.hot-update.js",
"/chunks/shared-page.2eca81dc50119aa702d2.hot-update.js": "/chunks/shared-page.2eca81dc50119aa702d2.hot-update.js",
"/chunks/shared-page.8fe102c2f0f2e1eb0982.hot-update.js": "/chunks/shared-page.8fe102c2f0f2e1eb0982.hot-update.js",
"/chunks/shared-page.37473bb834611b5f1ed4.hot-update.js": "/chunks/shared-page.37473bb834611b5f1ed4.hot-update.js",
"/chunks/shared-page.a37a7e3969ee0670a3a5.hot-update.js": "/chunks/shared-page.a37a7e3969ee0670a3a5.hot-update.js",
"/chunks/shared-page.78149b028d75ced4a25a.hot-update.js": "/chunks/shared-page.78149b028d75ced4a25a.hot-update.js",
"/chunks/app-language.310b9d5247c9aeb0df42.hot-update.js": "/chunks/app-language.310b9d5247c9aeb0df42.hot-update.js",
"/chunks/app-language.15fe991f0d7066dae7b0.hot-update.js": "/chunks/app-language.15fe991f0d7066dae7b0.hot-update.js",
"/chunks/app-language.df40578c7c2d43fc1559.hot-update.js": "/chunks/app-language.df40578c7c2d43fc1559.hot-update.js"
"/chunks/app-language.f2d6f777c948d2be3fa4.hot-update.js": "/chunks/app-language.f2d6f777c948d2be3fa4.hot-update.js",
"/chunks/app-language.eff2e9dae1a04c9ec690.hot-update.js": "/chunks/app-language.eff2e9dae1a04c9ec690.hot-update.js",
"/chunks/app-language.8f859b95699d27e6c06e.hot-update.js": "/chunks/app-language.8f859b95699d27e6c06e.hot-update.js"
}
resources/js/views/Admin/Languages/Language.vue
+1
View File
@@ -211,6 +211,7 @@ export default {
color: $text;
font-weight: 700;
@include font-size(13);
cursor: pointer;
}
.icon {
display: none;