This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Force chat export to use 24-hour timestamp format #9724
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
Z-Community-PR
richvdh
changed the title
richvdh
added
the
T-Enhancement
richvdh
suggested changes
Dec 8, 2022
There was a problem hiding this comment.
Thanks for this! Please do have a read through https://github.com/vector-im/element-web/blob/develop/CONTRIBUTING.md and make sure that you've done everything it asks.
Also note that the CI is currently failing for a number of different reasons. Please make sure you address the issues it has flagged up.
Comment on lines
+122
to
+134
| let date_time_string = new Date(event.getTs()).toLocaleString(); | ||
|
|
||
| // regex for dissecting the 12-hour timestamp | ||
| const TIMESTAMP_REGEX = /(\d*\/\d*\/[0-9]*), ([0-9]*:[0-9]*:[0-9]*) (AM|PM|am|pm|a\.m\.|p\.m\.)/; | ||
| const timestampRegexResult = TIMESTAMP_REGEX.match(date_time_string); | ||
|
|
||
| // ignore if the format happens to be in the 24-hour format | ||
| if (timestampRegexResult) { | ||
| const current_date = timestampRegexResult[1]; | ||
| const timestamp = timestampRegexResult[2]; | ||
| const am_or_pm = timestampRegexResult[3]; | ||
|
|
||
| if (am_or_pm === "am" || am_or_pm === "AM" || am_or_pm === "a.m.") { |
There was a problem hiding this comment.
there are easier ways of splitting up a Date than using a regexp; see for example Date.getHours.
Comment on lines
+124
to
+161
| // regex for dissecting the 12-hour timestamp | ||
| const TIMESTAMP_REGEX = /(\d*\/\d*\/[0-9]*), ([0-9]*:[0-9]*:[0-9]*) (AM|PM|am|pm|a\.m\.|p\.m\.)/; | ||
| const timestampRegexResult = TIMESTAMP_REGEX.match(date_time_string); | ||
|
|
||
| // ignore if the format happens to be in the 24-hour format | ||
| if (timestampRegexResult) { | ||
| const current_date = timestampRegexResult[1]; | ||
| const timestamp = timestampRegexResult[2]; | ||
| const am_or_pm = timestampRegexResult[3]; | ||
|
|
||
| if (am_or_pm === "am" || am_or_pm === "AM" || am_or_pm === "a.m.") { | ||
| if (timestamp.substring(0,2) === "12") { | ||
| date_time_string = `${current_date}, 00${timestamp.substring(2)}`; | ||
| } else if (timestamp.length == 7) { | ||
| date_time_string = `${current_date}, 0${timestamp}`; | ||
| } else { | ||
| date_time_string = `${current_date}, ${timestamp}`; | ||
| } | ||
| } else { | ||
| let hour = timestamp.substring(0,2); | ||
|
|
||
| if (hour === "12") { | ||
| date_time_string = `${current_date}, ${timestamp}`; | ||
| } else { | ||
|
|
||
| let substring_start_index = 2; | ||
| if (hour[1] === ":") { | ||
| hour = timestamp[0]; | ||
| substring_start_index = 1; | ||
| } | ||
|
|
||
| let new_hour = (+hour + 12).toString(); | ||
|
|
||
| date_time_string = `${current_date}, ${new_hour}${timestamp.substring(substring_start_index)}`; | ||
| } | ||
| } | ||
|
|
||
| } |
There was a problem hiding this comment.
please could you factor the Date processing out to a separate function, and add some tests for it.
|
Why wouldn't we want the chat export to match your own preference of 12/24hr instead of ignoring it? |
|
Thanks for your contribution but this is not desirable, the export should match your user preference for time format as per element-hq/element-web#23838 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
Notes: First open-source contribution and initial PR, addressing issue 23838 in the Element repo. Working on checklist.
Here's what your changelog entry will look like:
✨ Features