diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-06 10:31:10 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-06 10:31:10 -0500 |
| commit | 856e977356f0a70839f323deef44671fb3f6f533 (patch) | |
| tree | 42417941a0d77158f34e81c6999920928b0edb36 /www/js/MontageHistoryCtrl.js | |
| parent | 0786d0b87dc358be3919891bbb3c3b69b3978b37 (diff) | |
#175 - new option to enable/disable 24hr clock in Dev settings
Former-commit-id: 86fbef04eb4f75e4c4441fa7f57821cfe4d9bfe1
Diffstat (limited to 'www/js/MontageHistoryCtrl.js')
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index d733e9f7..e30b65c8 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -18,7 +18,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc //--------------------------------------- $scope.prettifyDate = function (str) { - return moment(str).format('MMM Do, YYYY h:mma'); + return moment(str).format('MMM Do, YYYY '+ZMDataModel.getTimeFormat()); }; function prettifyDate(str) { @@ -32,7 +32,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc $scope.prettify = function (str) { - return moment(str).format('h:mm:ssa on MMMM Do YYYY'); + return moment(str).format(ZMDataModel.getTimeFormat()+' on MMMM Do YYYY'); }; |