From ffb11b01a63a033efa26fb92e3f88df27eaacd46 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 21 May 2015 07:44:44 +0200
Subject: [PATCH] Some new translations.

---
 app/Http/Middleware/Range.php      |  6 +++---
 app/Http/breadcrumbs.php           |  2 +-
 public/js/firefly.js               | 17 +++++++++++++----
 resources/lang/en/firefly.php      | 14 ++++++++++----
 resources/lang/nl/firefly.php      |  7 +++++++
 resources/twig/layout/default.twig | 11 ++++++++++-
 6 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php
index ac0c05ac76..64ceaff4c4 100644
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -55,10 +55,10 @@ class Range
             if (!Session::has('start') && !Session::has('end')) {
 
                 /** @var \FireflyIII\Models\Preference $viewRange */
-                $viewRange = Preferences::get('viewRange', '1M');
+                $viewRange = Preferences::get('viewRange', '1M')->data;
                 $start     = new Carbon;
-                $start     = Navigation::updateStartDate($viewRange->data, $start);
-                $end       = Navigation::updateEndDate($viewRange->data, $start);
+                $start     = Navigation::updateStartDate($viewRange, $start);
+                $end       = Navigation::updateEndDate($viewRange, $start);
 
                 Session::put('start', $start);
                 Session::put('end', $end);
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index 6e1f520856..289eec2ca5 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -53,7 +53,7 @@ Breadcrumbs::register(
 
     $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type);
 
-    
+
     $breadcrumbs->parent('accounts.index', $what);
     $breadcrumbs->push(e($account->name), route('accounts.show', $account->id));
 }
diff --git a/public/js/firefly.js b/public/js/firefly.js
index e0a35830ea..a8c075a761 100644
--- a/public/js/firefly.js
+++ b/public/js/firefly.js
@@ -6,7 +6,7 @@ $(function () {
     ranges[currentMonthName] = [moment().startOf('month'), moment().endOf('month')];
     ranges[previousMonthName] = [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')];
     ranges[nextMonthName] = [moment().add(1, 'month').startOf('month'), moment().add(1, 'month').endOf('month')];
-    ranges['Everything'] = [firstDate, moment()];
+    ranges[everything] = [firstDate, moment()];
 
     $('#daterange').daterangepicker(
         {
@@ -15,10 +15,19 @@ $(function () {
             //View::share('nextMonthName', $next);
 
 
-            ranges: ranges
-            ,
+            ranges: ranges,
             opens: 'left',
-
+            locale: {
+                applyLabel: applyLabel,
+                cancelLabel: cancelLabel,
+                fromLabel: fromLabel,
+                toLabel: toLabel,
+                weekLabel: 'W',
+                customRangeLabel: customRangeLabel,
+                daysOfWeek: moment.weekdaysMin(),
+                monthNames: moment.monthsShort(),
+                firstDay: moment.localeData()._week.dow
+            },
             format: 'DD-MM-YYYY',
             startDate: start,
             endDate: end
diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php
index 8924b6f4ee..51fc1094f2 100644
--- a/resources/lang/en/firefly.php
+++ b/resources/lang/en/firefly.php
@@ -14,6 +14,13 @@ return [
     'delete'                      => 'Delete',
     'welcomeBack'                 => 'What\'s playing?',
 
+    'everything'                  => 'Everything',
+    'customRange'                 => 'Custom range',
+    'apply'                       => 'Apply',
+    'cancel'                      => 'Cancel',
+    'from'                        => 'From',
+    'to'                          => 'To',
+
     'details_for_asset'           => 'Details for asset account ":name"',
     'details_for_expense'         => 'Details for expense account ":name"',
     'details_for_revenue'         => 'Details for revenue account ":name"',
@@ -23,9 +30,9 @@ return [
     'store_new_expense_account'   => 'Store new expense account',
     'store_new_revenue_account'   => 'Store new revenue account',
 
-    'edit_asset_account'        => 'Edit asset account ":name"',
-    'edit_expense_account'      => 'Edit expense account ":name"',
-    'edit_revenue_account'      => 'Edit revenue account ":name"',
+    'edit_asset_account'          => 'Edit asset account ":name"',
+    'edit_expense_account'        => 'Edit expense account ":name"',
+    'edit_revenue_account'        => 'Edit revenue account ":name"',
 
     'update_asset_account'        => 'Update asset account',
     'update_expense_account'      => 'Update expense account',
@@ -36,7 +43,6 @@ return [
     'make_new_revenue_account'    => 'New revenue account',
 
 
-
     // new user:
     'welcome'                     => 'Welcome to Firefly!',
     'createNewAsset'              => 'Create a new asset account to get started. This will allow you to create transactions and start your financial management',
diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php
index bc4959d8d2..fe497b68f1 100644
--- a/resources/lang/nl/firefly.php
+++ b/resources/lang/nl/firefly.php
@@ -14,6 +14,13 @@ return [
     'delete'                      => 'Verwijder',
     'welcomeBack'                 => 'Hoe staat het er voor?',
 
+    'everything'                  => 'Alles',
+    'customRange'                 => 'Zelf bereik kiezen',
+    'apply'                       => 'Go',
+    'cancel'                      => 'Annuleren',
+    'from'                        => 'Van',
+    'to'                          => 'Tot',
+
     'details_for_asset'           => 'Overzicht voor betaalrekening ":name"',
     'details_for_expense'         => 'Overzicht voor crediteur ":name"',
     'details_for_revenue'         => 'Overzicht voor debiteur ":name"',
diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig
index 60038da2f8..c79316bc88 100644
--- a/resources/twig/layout/default.twig
+++ b/resources/twig/layout/default.twig
@@ -128,13 +128,22 @@
 <script type="text/javascript">
     var start = "{{Session.get('start').format('d-m-Y')}}";
     var end = "{{Session.get('end').format('d-m-Y')}}";
-    var titleString = "{{Session.get('start').format('j M Y')}} - {{Session.get('end').format('j M Y')}}";
+    var titleString = "{{Session.get('start').formatLocalized(monthAndDayFormat)}} - {{Session.get('end').formatLocalized(monthAndDayFormat)}}";
     var dateRangeURL = "{{route('daterange')}}";
     var token = "{{csrf_token()}}";
     var firstDate = moment("{{Session.get('first').format('Y-m-d')}}");
     var currentMonthName = "{{ currentMonthName }}";
     var previousMonthName = "{{ previousMonthName }}";
     var language = "{{ language }}";
+
+    // translations:
+    var everything = '{{ 'everything'|_ }}';
+    var customRangeLabel = '{{ 'customRange'|_ }}';
+    var applyLabel = '{{ 'apply'|_ }}';
+    var cancelLabel = '{{ 'cancel'|_ }}';
+    var fromLabel = '{{ 'from'|_ }}';
+    var toLabel = '{{ 'to'|_ }}';
+
     var nextMonthName = "{{ nextMonthName }}";
     var currencyCode = '{{getCurrencyCode() }}';
     $('#daterange span').text(titleString);