mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-15 18:14:09 -08:00
a2e70dd6b2
The legacy language warning was misfiring when a user's language didn't match the APP_LOCALE from .env. Additionally, we weren't properly warning when the legacy-language came from Settings or from the user themselves. Both of which should be impossible but still probably not a bad idea to warn on it, anyways
52 lines
1.5 KiB
PHP
52 lines
1.5 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Middleware;
|
|
|
|
use App\Models\Setting;
|
|
use Closure;
|
|
use \App\Helpers\Helper;
|
|
|
|
class CheckLocale
|
|
{
|
|
private function warn_legacy_locale($language, $source)
|
|
{
|
|
if ($language != Helper::mapLegacyLocale($language)) {
|
|
\Log::warning("$source $language and should be updated to be ".Helper::mapLegacyLocale($language));
|
|
}
|
|
}
|
|
/**
|
|
* Handle the locale for the user, default to settings otherwise.
|
|
*
|
|
* @param \Illuminate\Http\Request $request
|
|
* @param \Closure $next
|
|
* @param string|null $guard
|
|
*
|
|
* @return mixed
|
|
*/
|
|
public function handle($request, Closure $next, $guard = null)
|
|
{
|
|
|
|
// Default app settings from config
|
|
$language = config('app.locale');
|
|
$this->warn_legacy_locale($language, "APP_LOCALE in .env is set to");
|
|
|
|
if ($settings = Setting::getSettings()) {
|
|
|
|
// User's preference
|
|
if (($request->user()) && ($request->user()->locale)) {
|
|
$language = $request->user()->locale;
|
|
$this->warn_legacy_locale($language, "username ".$request->user()->username." (".$request->user()->id.") has a language");
|
|
|
|
// App setting preference
|
|
} elseif ($settings->locale != '') {
|
|
$language = $settings->locale;
|
|
$this->warn_legacy_locale($language, "App Settings is set to");
|
|
}
|
|
|
|
}
|
|
|
|
\App::setLocale(Helper::mapLegacyLocale($language));
|
|
return $next($request);
|
|
}
|
|
}
|