fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-25 14:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PORT] Fix toAbsoluteLocaleDate and add more tests (gitea#32387)

Browse source 
---
Conflict resolution: None
Done differently: Removed typescript types.

(cherry picked from commit aee9801d468997ab3cce32978416b697d9df77a7)
This commit is contained in:
wxiaoguang 2024-10-31 02:36:02 +08:00 committed by Gusted
parent bdd75c4b55
commit 9b442172fb
No known key found for this signature in database
GPG key ID: FD821B732837125F
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
web_src/js/webcomponents/absolute-date.js
View file

@ -1,5 +1,12 @@
export function toAbsoluteLocaleDate(date, lang, opts) { export function toAbsoluteLocaleDate(date, lang, opts) {
return new Date(date).toLocaleString(lang || [], opts); // only use the date part, it is guaranteed to be in ISO format (YYYY-MM-DDTHH:mm:ss.sssZ) or (YYYY-MM-DD)
// if there is an "Invalid Date" error, there must be something wrong in code and should be fixed.
// TODO: there is a root problem in backend code: the date "YYYY-MM-DD" is passed to backend without timezone (eg: deadline),
// then backend parses it in server's timezone and stores the parsed timestamp into database.
// If the user's timezone is different from the server's, the date might be displayed in the wrong day.
const dateSep = date.indexOf('T');
date = dateSep === -1 ? date : date.substring(0, dateSep);
return new Date(`${date}T00:00:00`).toLocaleString(lang || [], opts);
} }
window.customElements.define('absolute-date', class extends HTMLElement { window.customElements.define('absolute-date', class extends HTMLElement {
@ -15,14 +22,8 @@ window.customElements.define('absolute-date', class extends HTMLElement {
const lang = this.closest('[lang]')?.getAttribute('lang') || const lang = this.closest('[lang]')?.getAttribute('lang') ||
this.ownerDocument.documentElement.getAttribute('lang') || ''; this.ownerDocument.documentElement.getAttribute('lang') || '';
// only use the date part, it is guaranteed to be in ISO format (YYYY-MM-DDTHH:mm:ss.sssZ)
let date = this.getAttribute('date');
let dateSep = date.indexOf('T');
dateSep = dateSep === -1 ? date.indexOf(' ') : dateSep;
date = dateSep === -1 ? date : date.substring(0, dateSep);
if (!this.shadowRoot) this.attachShadow({mode: 'open'}); if (!this.shadowRoot) this.attachShadow({mode: 'open'});
this.shadowRoot.textContent = toAbsoluteLocaleDate(date, lang, opt); this.shadowRoot.textContent = toAbsoluteLocaleDate(this.getAttribute('date'), lang, opt);
}; };
attributeChangedCallback(_name, oldValue, newValue) { attributeChangedCallback(_name, oldValue, newValue) {

15
web_src/js/webcomponents/absolute-date.test.js
View file

@ -13,9 +13,14 @@ test('toAbsoluteLocaleDate', () => {
day: 'numeric', day: 'numeric',
})).toEqual('15. März 2024'); })).toEqual('15. März 2024');
expect(toAbsoluteLocaleDate('12345-03-15 01:02:03', '', { // these cases shouldn't happen
year: 'numeric', expect(toAbsoluteLocaleDate('2024-03-15 01:02:03', '', {})).toEqual('Invalid Date');
month: 'short', expect(toAbsoluteLocaleDate('10000-01-01', '', {})).toEqual('Invalid Date');
day: 'numeric',
})).toEqual('Mar 15, 12345'); // test different timezone
const oldTZ = process.env.TZ;
process.env.TZ = 'America/New_York';
expect(new Date('2024-03-15').toLocaleString()).toEqual('3/14/2024, 8:00:00 PM');
expect(toAbsoluteLocaleDate('2024-03-15')).toEqual('3/15/2024, 12:00:00 AM');
process.env.TZ = oldTZ;
}); });