From 74f098e71811585658882e41fcd5b3d98f7022af Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 25 May 2015 21:39:05 +0200
Subject: [PATCH] Some new translations [skip ci]

---
 app/Helpers/Reminders/ReminderHelper.php | 18 +++++++++++++++---
 app/Http/Middleware/Authenticate.php     |  3 ++-
 resources/lang/en/firefly.php            |  3 +++
 resources/lang/nl/firefly.php            |  2 ++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/Helpers/Reminders/ReminderHelper.php b/app/Helpers/Reminders/ReminderHelper.php
index e17c81281d..08d5e251c0 100644
--- a/app/Helpers/Reminders/ReminderHelper.php
+++ b/app/Helpers/Reminders/ReminderHelper.php
@@ -5,9 +5,11 @@ namespace FireflyIII\Helpers\Reminders;
 use Amount;
 use Auth;
 use Carbon\Carbon;
+use Config;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Reminder;
 use Navigation;
+use Preferences;
 
 /**
  * Class ReminderHelper
@@ -154,14 +156,24 @@ class ReminderHelper implements ReminderHelperInterface
         $piggyBank = $reminder->remindersable;
 
         if (is_null($piggyBank)) {
-            return 'Piggy bank no longer exists.';
+            return trans('firefly.piggy_bank_not_exists');
         }
 
         if (is_null($piggyBank->targetdate)) {
-            return 'Add money to this piggy bank to reach your target of ' . Amount::format($piggyBank->targetamount);
+            return trans('firefly.add_any_amount_to_piggy', ['amount' => Amount::format($piggyBank->targetamount)]);
         }
 
-        return 'Add ' . Amount::format($reminder->metadata->perReminder) . ' to fill this piggy bank on ' . $piggyBank->targetdate->format('jS F Y');
+        $lang = Preferences::get('language', 'en')->data;
+
+        return trans(
+            'firefly.add_set_amount_to_piggy',
+            [
+                'amount' => Amount::format($reminder->metadata->perReminder),
+                'date'   => $piggyBank->targetdate->formatLocalized(Config::get('firefly.monthAndDay.' . $lang))
+            ]
+        );
+
+        //return 'Add ' . Amount::format($reminder->metadata->perReminder) . ' to fill this piggy bank on ' . $piggyBank->targetdate->format('jS F Y');
 
     }
 }
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 8a54720f11..d447376e03 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -6,7 +6,7 @@ use Config;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\Request;
 use Preferences;
-
+use Carbon\Carbon;
 /**
  * Class Authenticate
  *
@@ -54,6 +54,7 @@ class Authenticate
         // if logged in, set user language:
         $pref = Preferences::get('language', 'en');
         App::setLocale($pref->data);
+        Carbon::setLocale($pref->data);
 
         setlocale(LC_TIME, Config::get('firefly.locales.' . $pref->data));
 
diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php
index c7fd2844f5..3b441fa7a3 100644
--- a/resources/lang/en/firefly.php
+++ b/resources/lang/en/firefly.php
@@ -242,6 +242,9 @@ return [
     'expected_amount_per_reminder'  => 'Expected amount per reminder',
     'todo'                          => 'to do',
     'table'                         => 'Table',
+    'piggy_bank_not_exists'         => 'Piggy bank no longer exists.',
+    'add_any_amount_to_piggy'       => 'Add money to this piggy bank to reach your target of :amount.',
+    'add_set_amount_to_piggy'       => 'Add :amount to fill this piggy bank on :date',
 
 
 ];
diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php
index 61733d3e0d..ed532b2cad 100644
--- a/resources/lang/nl/firefly.php
+++ b/resources/lang/nl/firefly.php
@@ -251,6 +251,8 @@ return [
     'expected_amount_per_reminder'  => 'Verwacht bedrag per herinnering',
     'todo'                          => 'te doen',
     'table'                         => 'Tabel',
+    'add_any_amount_to_piggy'       => 'Stop geld in dit spaarpotje om het doel van :amount te halen.',
+    'add_set_amount_to_piggy'       => 'Stop voor :date :amount in dit spaarpotje om hem op tijd te vullen.',
 
 
 ];