From f2e869f610a9b5a55a1a442b8cb61f9c3f18327f Mon Sep 17 00:00:00 2001
From: James Brooks <james@bluebaytravel.co.uk>
Date: Tue, 19 May 2015 17:18:21 +0100
Subject: [PATCH] Fixes #644 - Incident presenter respects the date format.

---
 app/Presenters/IncidentPresenter.php          |  5 ++--
 resources/lang/en/forms.php                   | 25 ++++++++++---------
 .../dashboard/settings/app-setup.blade.php    | 13 +++++++++-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/Presenters/IncidentPresenter.php b/app/Presenters/IncidentPresenter.php
index bbf0c9c4..c1d171ca 100644
--- a/app/Presenters/IncidentPresenter.php
+++ b/app/Presenters/IncidentPresenter.php
@@ -38,6 +38,7 @@ class IncidentPresenter extends BasePresenter
         parent::__construct($resource);
 
         $this->tz = Setting::get('app_timezone');
+        $this->format = Setting::get('incident_date_format') ?: 'l jS F Y H:i:s';
     }
 
     /**
@@ -71,7 +72,7 @@ class IncidentPresenter extends BasePresenter
     {
         return ucfirst((new Date($this->wrappedObject->created_at))
             ->setTimezone($this->tz)
-            ->format('l jS F Y H:i:s'));
+            ->format($this->format));
     }
 
     /**
@@ -105,7 +106,7 @@ class IncidentPresenter extends BasePresenter
     {
         return ucfirst((new Date($this->wrappedObject->scheduled_at))
             ->setTimezone($this->tz)
-            ->format('l jS F Y H:i:s'));
+            ->format($this->format));
     }
 
     /**
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index 88a6f7c2..b37a0bb0 100755
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -86,18 +86,19 @@ return [
     'settings' => [
         /// Application setup
         'app-setup' => [
-            'site-name'           => 'Site Name',
-            'site-url'            => 'Site URL',
-            'site-timezone'       => 'Site Timezone',
-            'site-locale'         => 'Site Language',
-            'date-format'         => 'Date Format',
-            'display-graphs'      => 'Display graphs on status page?',
-            'about-this-page'     => 'About this page',
-            'days-of-incidents'   => 'How many days of incidents to show?',
-            'banner'              => 'Banner Image',
-            'banner-help'         => "It's recommended that you upload files no bigger than 930px wide .",
-            'analytics_google'    => 'Google Analytics code',
-            'analytics_gosquared' => 'GoSquared Analytics code',
+            'site-name'            => 'Site Name',
+            'site-url'             => 'Site URL',
+            'site-timezone'        => 'Site Timezone',
+            'site-locale'          => 'Site Language',
+            'date-format'          => 'Date Format',
+            'incident-date-format' => 'Incident Timestamp Format',
+            'display-graphs'       => 'Display graphs on status page?',
+            'about-this-page'      => 'About this page',
+            'days-of-incidents'    => 'How many days of incidents to show?',
+            'banner'               => 'Banner Image',
+            'banner-help'          => "It's recommended that you upload files no bigger than 930px wide .",
+            'analytics_google'     => 'Google Analytics code',
+            'analytics_gosquared'  => 'GoSquared Analytics code',
         ],
         'security' => [
             'allowed-domains'      => 'Allowed domains',
diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php
index 09518f7f..5978c000 100644
--- a/resources/views/dashboard/settings/app-setup.blade.php
+++ b/resources/views/dashboard/settings/app-setup.blade.php
@@ -85,7 +85,18 @@
                                             {{ trans('forms.settings.app-setup.date-format') }}
                                             <a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="icon ion-help-circled"></i></a>
                                         </label>
-                                        <input type="text" class="form-control" name="date_format" value="{{ Setting::get('date_format') ?: 'jS F Y' }}">
+                                        <input type="text" class="form-control" name="date_format" value="{{ Setting::get('date_format') ?: 'l jS F Y H:i:s' }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-xs-12">
+                                    <div class="form-group">
+                                        <label>
+                                            {{ trans('forms.settings.app-setup.incident-date-format') }}
+                                            <a href="http://php.net/manual/en/function.date.php" target="_blank"><i class="icon ion-help-circled"></i></a>
+                                        </label>
+                                        <input type="text" class="form-control" name="incident_date_format" value="{{ Setting::get('incident_date_format') ?: 'l jS F Y H:i:s' }}">
                                     </div>
                                 </div>
                             </div>