From f0ec391af778f6a152b52b68e31b496fb5053aba Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 10 Nov 2016 15:00:43 -0500 Subject: timezone API check fix plus error handling for unplayable videos --- www/js/DataModel.js | 5 ++++- www/lang/locale-en.json | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 05972b9b..ad1aaff6 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1519,7 +1519,10 @@ angular.module('zmApp.controllers') tz = success.data.tz; d.resolve(tz); debug("Timezone API response is:" + success.data.tz); - isTzSupported = true; + if (success.data.tz !== undefined) + isTzSupported = true; + else + isTzSupported = false; $rootScope.$emit('tz-updated'); return (d.promise); diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index d9e70a12..5e9d032c 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -339,6 +339,8 @@ "kVersionIncompatible" :"I am incompatible with your ZoneMinder version", "kVibrateOnPush" :"Vibrate on push", "kVideo" :"Video", + "kVideoError" : "Video not playable.", + "kVideoErrorMobile" : "Video not playable. Try enabling 'force image path for events' in Dev Settings. The format may also be incompatible with a mobile system view", "kWake" :"Wake", "kWarningLargeTimeline" :"A large value can affect timeline performance. If you find timeline performance slow, try reducing the value to 200 and work your way up from there.", "kWeek" :"Week", -- cgit v1.2.3