mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-19 16:32:15 +00:00
Merge remote-tracking branch 'origin/version-1.8.3' into v2
# Conflicts: # app/FileManagerFolder.php # app/Http/Controllers/AppFunctionsController.php # app/Http/Controllers/Auth/AuthController.php # app/Http/Controllers/FileManager/BrowseController.php # app/Http/Controllers/General/SetupWizardController.php # app/Http/Controllers/General/UpgradeAppController.php # app/Http/Controllers/Sharing/FileSharingController.php # app/Http/helpers.php # app/Setting.php # composer.lock # public/mix-manifest.json # resources/js/App.vue # resources/js/components/Others/Forms/FormLabel.vue # resources/js/store/modules/app.js # resources/js/views/Admin.vue # resources/js/views/Mobile/AdminMobileMenu.vue # resources/js/views/Shared/SharedPage.vue # resources/views/index.blade.php # resources/views/vuefilemanager/crawler/og-view.blade.php # resources/views/vuefilemanager/invoice.blade.php # routes/api.php # routes/web.php
This commit is contained in:
@@ -5,6 +5,8 @@ use App\Models\Folder;
|
||||
use App\Models\Setting;
|
||||
use App\Models\User;
|
||||
use App\Models\Share;
|
||||
use App\Models\Language;
|
||||
use App\Models\LanguageString;
|
||||
use ByteUnits\Metric;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
@@ -811,3 +813,54 @@ function set_time_by_user_timezone($time)
|
||||
return Carbon::parse($time);
|
||||
|
||||
}
|
||||
|
||||
function __t($key, $values = null)
|
||||
{
|
||||
// Check if is in cache save default_language
|
||||
if (Cache::has('default_language')) {
|
||||
|
||||
$locale = Cache::get('default_language');
|
||||
} else {
|
||||
|
||||
$locale = Cache::rememberForever('default_language', function () {
|
||||
return get_setting('language');
|
||||
});
|
||||
}
|
||||
|
||||
// Check if cash has string
|
||||
if (Cache::has('language_strings-' . $locale)) {
|
||||
|
||||
$strings = Cache::get('language_strings-' . $locale)
|
||||
->languageStrings;
|
||||
|
||||
// Find the string by key
|
||||
$string = $strings->firstWhere('key', $key)->value;
|
||||
}
|
||||
|
||||
// If cash dont have string return string from database
|
||||
$string = LanguageString::whereLangAndKey($locale, $key)
|
||||
->first()
|
||||
->value;
|
||||
|
||||
if($values) {
|
||||
return adjust_value($string, $values);
|
||||
}
|
||||
|
||||
return $string;
|
||||
}
|
||||
|
||||
function adjust_value($string, $values)
|
||||
{
|
||||
$search = [];
|
||||
$replace = [];
|
||||
|
||||
if($values) {
|
||||
foreach($values as $key => $variable) {
|
||||
array_push($search, ':' . $key);
|
||||
array_push($replace, $variable);
|
||||
}
|
||||
}
|
||||
|
||||
return str_ireplace($search, $replace, $string);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user