From 8400ebc9c6f54b3de8cc08318417c0c4299d775a Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 14 May 2015 10:03:57 +0200 Subject: [PATCH] Added a language test, added Dutch basic file. [skip ci] --- app/Http/Middleware/Authenticate.php | 7 +++++++ resources/lang/en/firefly.php | 2 +- resources/lang/nl/firefly.php | 5 +++++ resources/twig/index.twig | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 resources/lang/nl/firefly.php diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index f5cfcdd144..aa9bb615b9 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -1,8 +1,11 @@ guest('auth/login'); } } + // if logged in, set user language: + $pref = Preferences::get('language', 'en'); + App::setLocale($pref->data); + return $next($request); } diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index b3214e3012..1b2c0b4b5d 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -1,7 +1,7 @@ 'You have selected English.', 'welcome' => 'Welcome to Firefly!', - 'mainTitle' => 'What\'s playing?', 'close' => 'Close', 'pleaseHold' => 'Please hold...', 'mandatoryFields' => 'Mandatory fields', diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php new file mode 100644 index 0000000000..a6331a34e5 --- /dev/null +++ b/resources/lang/nl/firefly.php @@ -0,0 +1,5 @@ + 'Nederlands geselecteerd!', + +]; diff --git a/resources/twig/index.twig b/resources/twig/index.twig index 36836b753b..570a33ba71 100644 --- a/resources/twig/index.twig +++ b/resources/twig/index.twig @@ -17,7 +17,7 @@

Start from scratch

{% else %} - + {% include 'partials/boxes.twig' %}