Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use 12-hour time (with some exceptions). 

(imported from commit 0cb3cfe23c8696368e3dc8ac51eaa5419928f6f5)
This commit is contained in:
Waseem Daher 2013-08-09 12:02:03 -04:00
parent d897d0ad57
commit 1f80302668
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
static/js/feature_flags.js
View File

@ -5,7 +5,8 @@ var exports = {};
exports.always_open_compose = true;
exports.mark_read_at_bottom = page_params.staging;
exports.summarize_read_while_narrowed = page_params.staging;
exports.twenty_four_hour_time = _.contains([],
page_params.email);
return exports;
}());

5
static/js/message_list.js
View File

@ -53,7 +53,10 @@ function add_display_time(message, prev) {
}
if (message.timestr === undefined){
message.timestr = time.toString("HH:mm");
message.timestr = time.toString("h:mmtt");
if (feature_flags.twenty_four_hour_time) {
message.timestr = time.toString("HH:mm");
}
}
}