summaryrefslogtreecommitdiff
path: root/www/js/MontageHistoryCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/MontageHistoryCtrl.js')
-rw-r--r--www/js/MontageHistoryCtrl.js4
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');
};