Verified Commit 41a94d07 authored by Rigel Kent's avatar Rigel Kent
Browse files

Refactor from-now pipe to display the two most significant intervals

parent 62eacb42
import { Pipe, PipeTransform } from '@angular/core'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { findIndex } from 'lodash-es'
// Thanks: https://stackoverflow.com/questions/3177836/how-to-format-time-since-xxx-e-g-4-minutes-ago-similar-to-stack-exchange-site
@Pipe({ name: 'myFromNow' })
......@@ -10,31 +11,73 @@ export class FromNowPipe implements PipeTransform {
transform (arg: number | Date | string) {
const argDate = new Date(arg)
const seconds = Math.floor((Date.now() - argDate.getTime()) / 1000)
let intervals = [
{
unit: 31536000, // 1 year
singular: (i: number) => this.i18n('{{i}} year', { i }),
plural: (i: number) => this.i18n('{{i}} years', { i })
},
{
unit: 2592000, // 1 month
max: 11,
singular: (i: number) => this.i18n('{{i}} month', { i }),
plural: (i: number) => this.i18n('{{i}} months', { i })
},
{
unit: 604800, // 1 week
max: 3,
singular: (i: number) => this.i18n('{{i}} week', { i }),
plural: (i: number) => this.i18n('{{i}} weeks', { i })
},
{
unit: 86400, // 1 day
max: 6,
singular: (i: number) => this.i18n('{{i}} day', { i }),
plural: (i: number) => this.i18n('{{i}} days', { i })
},
{
unit: 3600, // 1 hour
max: 23,
singular: (i: number) => this.i18n('{{i}} hour', { i }),
plural: (i: number) => this.i18n('{{i}} hours', { i })
},
{
unit: 60, // 1 min
max: 59,
singular: (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
.map((i, index, array) => ({ // interval relative to remainder
...i,
interval: index === 0
? i.interval
: 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
...i,
value: (i.interval > 1
? i.plural
: i.singular
)(Math.min(i.max, i.interval)) // respect the max value
}))
let interval = Math.floor(seconds / 31536000)
if (interval > 1) {
return this.i18n('{{interval}} years ago', { interval })
}
interval = Math.floor(seconds / 2592000)
if (interval > 1) return this.i18n('{{interval}} months ago', { interval })
if (interval === 1) return this.i18n('{{interval}} month ago', { interval })
interval = Math.floor(seconds / 604800)
if (interval > 1) return this.i18n('{{interval}} weeks ago', { interval })
if (interval === 1) return this.i18n('{{interval}} week ago', { interval })
// only keep the first two intervals with enough seconds to be considered
const big_interval_index = findIndex(intervals, i => i.interval >= 1)
intervals = intervals
.slice(big_interval_index, big_interval_index + 2)
.filter(i => i.interval >= 1)
interval = Math.floor(seconds / 86400)
if (interval > 1) return this.i18n('{{interval}} days ago', { interval })
if (interval === 1) return this.i18n('{{interval}} day ago', { interval })
interval = Math.floor(seconds / 3600)
if (interval > 1) return this.i18n('{{interval}} hours ago', { interval })
if (interval === 1) return this.i18n('{{interval}} hour ago', { interval })
interval = Math.floor(seconds / 60)
if (interval >= 1) return this.i18n('{{interval}} min ago', { interval })
if (intervals.length === 0) {
return this.i18n('just now')
}
return this.i18n('{{interval}} sec ago', { interval: Math.max(0, seconds) })
return intervals.length == 1
? this.i18n('{{interval}} ago', { interval: intervals[0].value })
: this.i18n('{{big_interval}} {{small_interval}} ago', {
big_interval: intervals[0].value,
small_interval: intervals[1].value
})
}
}
......@@ -169,7 +169,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
let message = 'Do you really want to delete this comment?'
if (commentToDelete.isLocal) {
message += this.i18n(' The deletion will be sent to remote instances, so they remove the comment too.')
message += this.i18n(' The deletion will be sent to remote instances so they can reflect the change.')
} else {
message += this.i18n(' It is a remote comment, so the deletion will only be effective on your instance.')
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment