lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use settings repository

Browse Source
This commit is contained in:
James Brooks
2017-01-03 14:33:22 +00:00
parent c4c11922cd
commit 279475df03
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/Http/Middleware/Localize.php
View File

@@ -11,9 +11,10 @@
namespace CachetHQ\Cachet\Http\Middleware; namespace CachetHQ\Cachet\Http\Middleware;
use CachetHQ\Cachet\Settings\Repository as SettingsRepository;
use Carbon\Carbon; use Carbon\Carbon;
use Closure; use Closure;
use Illuminate\Config\Repository; use Illuminate\Contracts\Config\Repository as ConfigRepository;
use Illuminate\Http\Request; use Illuminate\Http\Request;
/** /**
@@ -25,31 +26,32 @@ use Illuminate\Http\Request;
*/ */
class Localize class Localize
{ {
/**
* Array of languages Cachet can use.
*
* @var string[]
*/
protected $langs;
/** /**
* The config repository instance. * The config repository instance.
* *
* @var \Illuminate\Config\Repository * @var \Illuminate\Contracts\Config\Repository
*/ */
protected $config; protected $config;
/**
* The settings repository instance.
*
* @var \CachetHQ\Cachet\Settings\Repository
*/
protected $settings;
/** /**
* Constructs a new localize middleware instance. * Constructs a new localize middleware instance.
* *
* @param \Illuminate\Config\Repository $config * @param \Illuminate\Contracts\Config\Repository $config
* @param \CachetHQ\Cachet\Settings\Repository $settings
* *
* @return void * @return void
*/ */
public function __construct(Repository $config) public function __construct(ConfigRepository $config, SettingsRepository $settings)
{ {
$this->config = $config; $this->config = $config;
$this->langs = $config->get('langs'); $this->settings = $settings;
} }
/** /**
@@ -62,17 +64,18 @@ class Localize
*/ */
public function handle(Request $request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if (!(bool) $this->config->get('setting.automatic_localization')) { if (!(bool) $this->settings->get('automatic_localization')) {
return $next($request); return $next($request);
} }
$supportedLanguages = $request->getLanguages(); $requestedLanguages = $request->getLanguages();
$userLanguage = $this->config->get('app.locale'); $userLanguage = $this->config->get('app.locale');
$langs = $this->config->get('langs');
foreach ($supportedLanguages as $language) { foreach ($requestedLanguages as $language) {
$language = str_replace('_', '-', $language); $language = str_replace('_', '-', $language);
if (isset($this->langs[$language])) { if (isset($langs[$language])) {
$userLanguage = $language; $userLanguage = $language;
break; break;
} }