From 4720252ba5e1e981c8f78a3e57a36003b91ce82d Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 18 Oct 2016 17:02:03 -0400
Subject: #353 - more updates - need to check how it behaves with Montage Ctrl

Former-commit-id: 1e61637ba0bc6897b5c7d08c7a04c1243766f8d4
---
 www/js/EventModalCtrl.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'www/js/EventModalCtrl.js')

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index d91986aa..37b41548 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1169,7 +1169,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     function humanizeTime(str)
     {
-         return moment(str).fromNow();
+         if (NVRDataModel.getLogin().useLocalTimeZone)
+            return moment.tz(str, NVRDataModel.getTimeZoneNow()).fromNow();
+        else    
+            return moment(str).fromNow();
         
     }
 
-- 
cgit v1.2.3