mirror of https://github.com/zulip/zulip.git
Use 12-hour time (with some exceptions).
(imported from commit 0cb3cfe23c8696368e3dc8ac51eaa5419928f6f5)
This commit is contained in:
parent
d897d0ad57
commit
1f80302668
|
@ -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;
|
||||
|
||||
}());
|
||||
|
|
|
@ -53,8 +53,11 @@ function add_display_time(message, prev) {
|
|||
}
|
||||
|
||||
if (message.timestr === undefined){
|
||||
message.timestr = time.toString("h:mmtt");
|
||||
if (feature_flags.twenty_four_hour_time) {
|
||||
message.timestr = time.toString("HH:mm");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MessageList.prototype = {
|
||||
|
|
Loading…
Reference in New Issue