r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 12hour format

Browse Source
This commit is contained in:
Eduard Kuzmenko 2022-04-19 22:39:03 +03:00
parent 4336260293
commit e68ab4d229
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/langPack.ts
View File

@ -526,13 +526,14 @@ namespace I18n {
let text: string; let text: string;
if(this.options.hour && this.options.minute && Object.keys(this.options).length === 2/* && false */) { if(this.options.hour && this.options.minute && Object.keys(this.options).length === 2/* && false */) {
text = ('0' + this.date.getHours()).slice(-2) + ':' + ('0' + this.date.getMinutes()).slice(-2); let hours = this.date.getHours();
text = ('0' + (timeFormat === 'h12' ? (hours % 12) || 12 : hours)).slice(-2) + ':' + ('0' + this.date.getMinutes()).slice(-2);
// if(this.options.second) { // if(this.options.second) {
// text += ':' + ('0' + this.date.getSeconds()).slice(-2); // text += ':' + ('0' + this.date.getSeconds()).slice(-2);
// } // }
if(timeFormat === 'h12') { if(timeFormat === 'h12') {
text += ' ' + (this.date.getHours() < 12 ? amPmCache.am : amPmCache.pm); text += ' ' + (hours < 12 ? amPmCache.am : amPmCache.pm);
} }
} else { } else {
// * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/hourCycle#adding_an_hour_cycle_via_the_locale_string // * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/hourCycle#adding_an_hour_cycle_via_the_locale_string