eClassify/admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hamma modellarda get serizlizers uchun fiedl qoshilfi

Browse Source
This commit is contained in:
Husanjonazamov
2026-03-02 15:51:36 +05:00
parent 44cb95268d
commit bbddec954d
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Http/Controllers/LanguageController.php
View File

@@ -75,7 +75,7 @@ class LanguageController extends Controller
$sql = Language::orderBy($sort, $order); $sql = Language::orderBy($sort, $order);
if (! empty($_GET['search'])) { if (!empty($_GET['search'])) {
$search = $_GET['search']; $search = $_GET['search'];
$sql->where('id', 'LIKE', "%$search%")->orwhere('code', 'LIKE', "%$search%")->orwhere('name', 'LIKE', "%$search%"); $sql->where('id', 'LIKE', "%$search%")->orwhere('code', 'LIKE', "%$search%")->orwhere('name', 'LIKE', "%$search%");
} }
@@ -311,10 +311,10 @@ class LanguageController extends Controller
// 3. Update current user's session so the UI reflects the change immediately // 3. Update current user's session so the UI reflects the change immediately
$language = Language::where('code', $request->default_language)->firstOrFail(); $language = Language::where('code', $request->default_language)->firstOrFail();
Session::put('locale', $request->default_language); Session::put('locale', $request->default_language);
Session::put('language', $language); Session::put('language', $language);
// Clear the CachingService cache if it has one (e.g., system_settings) // Clear the CachingService cache if it has one (e.g., system_settings)
// Cache::forget('system_settings'); // Cache::forget('system_settings');
@@ -349,7 +349,7 @@ class LanguageController extends Controller
$jsonFile = base_path("resources/lang/{$fileName}"); $jsonFile = base_path("resources/lang/{$fileName}");
if (! File::exists($jsonFile)) { if (!File::exists($jsonFile)) {
if (File::exists($defaultFile)) { if (File::exists($defaultFile)) {
$defaultContent = File::get($defaultFile); $defaultContent = File::get($defaultFile);
} else { } else {
@@ -371,15 +371,22 @@ class LanguageController extends Controller
$jsonContent = File::get($jsonFile); $jsonContent = File::get($jsonFile);
$enContent = File::exists($defaultFile) ? json_decode(File::get($defaultFile), true) : []; $enContent = File::exists($defaultFile) ? json_decode(File::get($defaultFile), true) : [];
if (!is_array($enContent)) {
$enContent = [];
}
$targetContent = File::exists($jsonFile) ? json_decode(File::get($jsonFile), true) : []; $targetContent = File::exists($jsonFile) ? json_decode(File::get($jsonFile), true) : [];
if (!is_array($targetContent)) {
$targetContent = [];
}
foreach ($enContent as $key => $value) { foreach ($enContent as $key => $value) {
if (! array_key_exists($key, $targetContent)) { if (!array_key_exists($key, $targetContent)) {
$targetContent[$key] = $value; $targetContent[$key] = $value;
} }
} }
File::put($jsonFile, json_encode($targetContent, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)); File::put($jsonFile, json_encode($targetContent, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
$enLabels = json_decode($jsonContent, true); $enLabels = $targetContent;
return view('settings.languageedit', compact('enLabels', 'language', 'type')); return view('settings.languageedit', compact('enLabels', 'language', 'type'));
} }
@@ -399,16 +406,19 @@ class LanguageController extends Controller
} }
$directory = dirname($jsonFile); $directory = dirname($jsonFile);
if (! File::exists($directory)) { if (!File::exists($directory)) {
File::makeDirectory($directory, 0755, true); File::makeDirectory($directory, 0755, true);
} }
if (! File::exists($jsonFile)) { if (!File::exists($jsonFile)) {
$defaultContent = []; $defaultContent = [];
File::put($jsonFile, json_encode($defaultContent, JSON_PRETTY_PRINT)); File::put($jsonFile, json_encode($defaultContent, JSON_PRETTY_PRINT));
} }
$jsonContent = File::get($jsonFile); $jsonContent = File::get($jsonFile);
$enLabels = json_decode($jsonContent, true); $enLabels = json_decode($jsonContent, true);
if (!is_array($enLabels)) {
$enLabels = [];
}
$updatedLabels = $request->input('values'); $updatedLabels = $request->input('values');
$keys = array_keys($enLabels); $keys = array_keys($enLabels);
@@ -447,7 +457,7 @@ class LanguageController extends Controller
$jsonFile = base_path("resources/lang/{$fileName}"); $jsonFile = base_path("resources/lang/{$fileName}");
// If file does not exist, create it from default // If file does not exist, create it from default
if (! File::exists($jsonFile)) { if (!File::exists($jsonFile)) {
$defaultContent = File::exists($defaultFile) $defaultContent = File::exists($defaultFile)
? File::get($defaultFile) ? File::get($defaultFile)
: json_encode([], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE); : json_encode([], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
@@ -465,7 +475,7 @@ class LanguageController extends Controller
$language->save(); $language->save();
} }
if (! File::exists($jsonFile)) { if (!File::exists($jsonFile)) {
abort(404, 'File not found'); abort(404, 'File not found');
} }