OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve from-now pipe readability

pull/2639/head
Rigel Kent 2020-04-11 18:30:39 +02:00
parent 41a94d07f0
commit 1242fd55f9
No known key found for this signature in database
GPG Key ID: 5E53E96A494E452F
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/app/shared/angular/from-now.pipe.ts
View File

@ -8,7 +8,7 @@ export class FromNowPipe implements PipeTransform {
constructor (private i18n: I18n) { } constructor (private i18n: I18n) { }
transform (arg: number | Date | string) { transform (arg: number | Date | string, short = true) {
const argDate = new Date(arg) const argDate = new Date(arg)
const seconds = Math.floor((Date.now() - argDate.getTime()) / 1000) const seconds = Math.floor((Date.now() - argDate.getTime()) / 1000)
let intervals = [ let intervals = [
@ -48,19 +48,22 @@ export class FromNowPipe implements PipeTransform {
plural: (i: number) => this.i18n('{{i}} min', { i }) plural: (i: number) => this.i18n('{{i}} min', { i })
} }
] ]
.map(i => ({ ...i, interval: Math.floor(seconds / i.unit) })) // absolute interval // compute the number of units each unit of time has, store it in "interval"
.map((i, index, array) => ({ // interval relative to remainder .map(i => ({
...i,
interval: Math.floor(seconds / i.unit)
}))
// compute the number of units each unit of time has, from the remainder of the previous bigger unit, store it in "interval"
.map((i, index, array) => ({
...i, ...i,
interval: index === 0 interval: index === 0
? i.interval ? i.interval
: Math.floor((seconds - array[index - 1].interval * array[index - 1].unit) / i.unit) : Math.floor((seconds - array[index - 1].interval * array[index - 1].unit) / i.unit)
})) }))
.map(i => ({ // value, interval put in its translated text wrt max value // compute the final string from the "interval", cap it to the max value for the time unit
.map(i => ({
...i, ...i,
value: (i.interval > 1 value: (i.interval > 1 ? i.plural : i.singular)(Math.min(i.max, i.interval))
? i.plural
: i.singular
)(Math.min(i.max, i.interval)) // respect the max value
})) }))
// only keep the first two intervals with enough seconds to be considered // only keep the first two intervals with enough seconds to be considered
@ -73,7 +76,7 @@ export class FromNowPipe implements PipeTransform {
return this.i18n('just now') return this.i18n('just now')
} }
return intervals.length == 1 return intervals.length === 1 || short
? this.i18n('{{interval}} ago', { interval: intervals[0].value }) ? this.i18n('{{interval}} ago', { interval: intervals[0].value })
: this.i18n('{{big_interval}} {{small_interval}} ago', { : this.i18n('{{big_interval}} {{small_interval}} ago', {
big_interval: intervals[0].value, big_interval: intervals[0].value,

5
client/src/sass/primeng-custom.scss
View File

@ -232,6 +232,11 @@ p-table {
color: #fff !important; color: #fff !important;
background-color: var(--mainColor) !important; background-color: var(--mainColor) !important;
} }
&.focus-within,
&:focus {
box-shadow: #{$focus-box-shadow-form} var(--mainColorLightest);
}
} }
} }
} }