CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-21 21:32:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

time_widget: Make the generated time string more readable.

Browse Source 
Before: <time:2021-07-14T00:14:00-07:00>
After: <time:2021-07-14|00:14:00|UTC-07:00>

Fixes #19205
This commit is contained in:
Ganesh Pawar 2021-08-01 21:47:43 +05:30 committed by Tim Abbott
parent 49907173b2
commit 1965584eec
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/composebox_typeahead.js
View File

@ -1,4 +1,4 @@
import {formatISO} from "date-fns";
import {format} from "date-fns";
import ConfirmDatePlugin from "flatpickr/dist/plugins/confirmDate/confirmDate";
import $ from "jquery";
import _ from "lodash";
@ -778,7 +778,7 @@ const show_flatpickr = (element, callback, default_timestamp) => {
plugins: [new ConfirmDatePlugin({})],
positionElement: element,
dateFormat: "Z",
formatDate: (date) => formatISO(date),
formatDate: (date) => format(date, "yyyy-MM-dd|HH:mm:ss|'UTC'xxx"),
});
const container = $($(instance.innerContainer).parent());
container.on("click", ".flatpickr-calendar", (e) => {

9
static/js/markdown.js
View File

@ -346,7 +346,14 @@ function handleEmoji(emoji_name) {
function handleTimestamp(time) {
let timeobject;
if (Number.isNaN(Number(time))) {
timeobject = new Date(time); // not a Unix timestamp
// Check if the time string is of the new more-readable format.
if (time.includes("|UTC")) {
// Remove and replace the non-standard characters with the ISO ones.
const standard_format_time = time.replace("|UTC", "").replace(/\|/g, "T");
timeobject = new Date(standard_format_time);
} else {
timeobject = new Date(time); // not a Unix timestamp
}
} else {
// JavaScript dates are in milliseconds, Unix timestamps are in seconds
timeobject = new Date(time * 1000);

8
zerver/lib/markdown/__init__.py
View File

@ -1369,7 +1369,13 @@ class Timestamp(markdown.inlinepatterns.Pattern):
time_input_string = match.group("time")
timestamp = None
try:
timestamp = dateutil.parser.parse(time_input_string, tzinfos=common_timezones)
# Check if the time string is of the new more-readable format.
if "|UTC" in time_input_string:
# Remove and replace the non-standard characters with the ISO ones.
standard_format_time = time_input_string.replace("|", "T", 1).replace("|UTC", "")
timestamp = dateutil.parser.parse(standard_format_time, tzinfos=common_timezones)
else:
timestamp = dateutil.parser.parse(time_input_string, tzinfos=common_timezones)
except ValueError:
try:
timestamp = datetime.datetime.fromtimestamp(float(time_input_string))

13
zerver/tests/fixtures/markdown_test_cases.json vendored
View File

@ -790,6 +790,19 @@
"expected_output": "<p>Let's meet at <time datetime=\"2017-06-05T22:30:00Z\">1496701800</time>.</p>",
"text_content": "Let's meet at 1496701800."
},
{
"name": "timestamp_new_format",
"input": "<time:2021-08-02|14:03:00|UTC+05:30>",
"expected_output": "<p><time datetime=\"2021-08-02T08:33:00Z\">2021-08-02|14:03:00|UTC+05:30</time></p>",
"text_content": "2021-08-02|14:03:00|UTC+05:30"
},
{
"name": "timestamp_without_utc",
"input": "<time:2021-08-02|14:03:00|+05:30>",
"expected_output": "<p><span class=\"timestamp-error\">Invalid time format: 2021-08-02|14:03:00|+05:30</span></p>",
"marked_expected_output": "<p><span>2021-08-02|14:03:00|+05:30</span></p>",
"text_content": "Invalid time format: 2021-08-02|14:03:00|+05:30"
},
{
"name": "tex_inline",
"input": "$$1 \\oplus 0 = 1$$",