Merge branch 'absolute_time_format' into 'develop'
Absolute time format Closes #1342 See merge request pleroma/pleroma-fe!1952
This commit is contained in:
commit
1857d0fadd
1
changelog.d/weird-absolute-time-format.fix
Normal file
1
changelog.d/weird-absolute-time-format.fix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Show only month and day instead of weird "day, hour" format. While at it, fixed typo "defualt" in a comment.
|
|
@ -61,7 +61,7 @@ export default {
|
||||||
})
|
})
|
||||||
} else if (DateUtils.isSameMonth(this.timeAsDate, now)) {
|
} else if (DateUtils.isSameMonth(this.timeAsDate, now)) {
|
||||||
return new Intl.DateTimeFormat(this.browserLocale, {
|
return new Intl.DateTimeFormat(this.browserLocale, {
|
||||||
hour: 'numeric',
|
month: 'short',
|
||||||
day: 'numeric'
|
day: 'numeric'
|
||||||
})
|
})
|
||||||
} else if (DateUtils.isSameYear(this.timeAsDate, now)) {
|
} else if (DateUtils.isSameYear(this.timeAsDate, now)) {
|
||||||
|
|
|
@ -181,7 +181,7 @@ export const defaultState = {
|
||||||
closingDrawerMarksAsSeen: undefined, // instance default
|
closingDrawerMarksAsSeen: undefined, // instance default
|
||||||
unseenAtTop: undefined, // instance default
|
unseenAtTop: undefined, // instance default
|
||||||
ignoreInactionableSeen: undefined, // instance default
|
ignoreInactionableSeen: undefined, // instance default
|
||||||
useAbsoluteTimeFormat: undefined, // instance defualt
|
useAbsoluteTimeFormat: undefined, // instance default
|
||||||
absoluteTimeFormatMinAge: undefined // instance default
|
absoluteTimeFormatMinAge: undefined // instance default
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue