kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 17:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Locales: use http-accept-language or cookie (#976)

Browse Source 
* Locales: use http-accept-language or "language"-cookie

* Add user-setting "locale"

Rename CULTURE to DEFAULT_LOCALE

* Use LocaleMiddleware also in dev mode

* CORS: don't require authentication on OPTIONS

* Use a standard user-settings-control and start a new generic user settings page, not a separate page for the locale setting

* Fixed (broken by myself) link-return handling

* Clarify language settings

* Removed unneeded files

* Better user settings icon

* Added localization hints

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
This commit is contained in:
fipwmaqzufheoxq92ebc
2020-08-31 19:11:51 +02:00
committed by GitHub
parent 4a030b7ffc
commit 6f8ad9b76e
21 changed files with 383 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
middleware/CorsMiddleware.php
View File

@@ -2,28 +2,40 @@
namespace Grocy\Middleware;
use Psr\Http\Message\ResponseFactoryInterface;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Server\RequestHandlerInterface as RequestHandler;
use Psr\Http\Message\ResponseInterface as Response;
use Slim\Routing\RouteContext;
class CorsMiddleware extends BaseMiddleware
class CorsMiddleware
{
/**
* @var ResponseFactoryInterface
*/
private $responseFactory;
public function __construct(ResponseFactoryInterface $responseFactory)
{
$this->responseFactory = $responseFactory;
}
public function __invoke(Request $request, RequestHandler $handler): Response
{
$response = $handler->handle($request);
if ($request->getMethod() == "OPTIONS")
$response = $this->responseFactory->createResponse(200);
else {
$response = $handler->handle($request);
}
//$routeContext = RouteContext::fromRequest($request);
//$routingResults = $routeContext->getRoutingResults();
//$methods = $routingResults->getAllowedMethods();
//$requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers');
$response = $handler->handle($request);
$response = $response->withHeader('Access-Control-Allow-Origin', '*');
$response = $response->withHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
$response = $response->withHeader('Access-Control-Allow-Headers', '*');
$response = $response->withStatus(204);
return $response;
}

67
middleware/LocaleMiddleware.php Normal file
View File

@@ -0,0 +1,67 @@
<?php
namespace Grocy\Middleware;
use Grocy\Services\UsersService;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Server\RequestHandlerInterface as RequestHandler;
class LocaleMiddleware extends BaseMiddleware
{
public function __invoke(Request $request, RequestHandler $handler): Response
{
$locale = $this->getLocale($request);
define('GROCY_LOCALE', $locale);
return $handler->handle($request);
}
protected function getLocale(Request $request)
{
if(GROCY_AUTHENTICATED)
{
$locale = UsersService::getInstance()->GetUserSetting(GROCY_USER_ID, 'locale');
if (isset($locale) && !empty($locale)) {
if (in_array($locale, scandir(__DIR__ . '/../localization'))) {
return $locale;
}
}
}
$langs = join(',', $request->getHeader('Accept-Language'));
// src: https://gist.github.com/spolischook/0cde9c6286415cddc088
$prefLocales = array_reduce(
explode(',', $langs),
function ($res, $el) {
list($l, $q) = array_merge(explode(';q=', $el), [1]);
$res[$l] = (float) $q;
return $res;
}, []);
arsort($prefLocales);
$availableLocales = scandir(__DIR__ . '/../localization');
foreach ($prefLocales as $locale => $q) {
if(in_array($locale, $availableLocales))
{
return $locale;
}
// e.g. en_GB
if(in_array(substr($locale, 0, 5), $availableLocales))
{
return substr($locale, 0, 5);
}
// e.g: cs
// or en
// or de
if(in_array(substr($locale, 0, 2), $availableLocales))
{
return substr($locale, 0, 2);
}
}
return GROCY_DEFAULT_LOCALE;
}
}