Added a language test, added Dutch basic file. [skip ci]

This commit is contained in:
James Cole 2015-05-14 10:03:57 +02:00
parent 9f99e7c0af
commit 8400ebc9c6
4 changed files with 14 additions and 2 deletions

View File

@ -1,8 +1,11 @@
<?php namespace FireflyIII\Http\Middleware; <?php namespace FireflyIII\Http\Middleware;
use App;
use Closure; use Closure;
use FireflyIII\Models\Preference;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Preferences;
/** /**
* Class Authenticate * Class Authenticate
@ -48,6 +51,10 @@ class Authenticate
return redirect()->guest('auth/login'); return redirect()->guest('auth/login');
} }
} }
// if logged in, set user language:
$pref = Preferences::get('language', 'en');
App::setLocale($pref->data);
return $next($request); return $next($request);
} }

View File

@ -1,7 +1,7 @@
<?php <?php
return [ return [
'test' => 'You have selected English.',
'welcome' => 'Welcome to Firefly!', 'welcome' => 'Welcome to Firefly!',
'mainTitle' => 'What\'s playing?',
'close' => 'Close', 'close' => 'Close',
'pleaseHold' => 'Please hold...', 'pleaseHold' => 'Please hold...',
'mandatoryFields' => 'Mandatory fields', 'mandatoryFields' => 'Mandatory fields',

View File

@ -0,0 +1,5 @@
<?php
return [
'test' => 'Nederlands geselecteerd!',
];

View File

@ -17,7 +17,7 @@
<h2><a href="{{route('accounts.create','asset')}}">Start from scratch</a></h2> <h2><a href="{{route('accounts.create','asset')}}">Start from scratch</a></h2>
</div> </div>
{% else %} {% else %}
<!-- Language test: {{ 'test'|_ }} -->
<!-- fancy new boxes --> <!-- fancy new boxes -->
{% include 'partials/boxes.twig' %} {% include 'partials/boxes.twig' %}