nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 08:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

language fixes

Browse Source
This commit is contained in:
Peter Papp
2021-04-17 10:12:26 +02:00
parent be6ccecee6
commit fc11a38457
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/helpers.php
View File

@@ -10,6 +10,7 @@ use App\Models\LanguageTranslation;
use ByteUnits\Metric; use ByteUnits\Metric;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\QueryException;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@@ -851,11 +852,20 @@ function __t($key, $values = null)
{ {
// Get current locale // Get current locale
$locale = cache()->rememberForever('language', function () { $locale = cache()->rememberForever('language', function () {
return get_setting('language') ?? 'en'; try {
return get_setting('language') ?? 'en';
} catch (QueryException $e) {
return 'en';
}
}); });
// Get language strings
$strings = cache()->rememberForever("language-translations-$locale", function () use ($locale) { $strings = cache()->rememberForever("language-translations-$locale", function () use ($locale) {
return Language::whereLocale($locale)->first()->languageTranslations ?? get_default_language_translations(); try {
return Language::whereLocale($locale)->first()->languageTranslations ?? get_default_language_translations();
} catch (QueryException $e) {
return get_default_language_translations();
}
}); });
// Find the string by key // Find the string by key

4
resources/js/views/Admin/Languages/Language.vue
View File

@@ -386,7 +386,7 @@
} }
.languages-wrapper { .languages-wrapper {
margin-top: 0px; margin-top: 0;
} }
} }
} }
@@ -430,7 +430,7 @@
@media only screen and (max-width: 1024px) { @media only screen and (max-width: 1024px) {
.search-bar-wrapper { .search-bar-wrapper {
top: 15px; top: 58px;
z-index: 7; z-index: 7;
} }
} }