User configurable locale (language) (#10204)

* Support for system APP_LOCALE

* Start preferences re-write

* port 2fa form

* Working user preferences

* Language user preference

* Don't look up locale from the DB every request

* Device list working

* Deny demo user middleware

* Finish password changing

* remove used resource methods

* remove leftover use

* warn that translation is incomplete

* fix style
This commit is contained in:
Tony Murray
2019-05-23 10:05:45 -05:00
committed by GitHub
parent 90bb68f026
commit 90a67c2ece
15 changed files with 449 additions and 250 deletions
@@ -89,7 +89,7 @@ class TwoFactorController extends Controller
return view('auth.2fa')->with([
'key' => $twoFactorSettings['key'],
'uri' => $this->genUri($request->user(), $twoFactorSettings),
'uri' => TwoFactor::generateUri($request->user()->username, $twoFactorSettings['key'], $twoFactorSettings['counter'] !== false),
])->withErrors($errors);
}
@@ -211,18 +211,4 @@ class TwoFactorController extends Controller
return UserPref::getPref($user, 'twofactor');
}
private function genUri($user, $settings)
{
$title = "LibreNMS:" . urlencode($user->username);
$key = $settings['key'];
// time based
if ($settings['counter'] === false) {
return "otpauth://totp/$title?issuer=LibreNMS&secret=$key";
}
// counter based
return "otpauth://hotp/$title?issuer=LibreNMS&counter=1&secret=$key";
}
}