ActivityPub-federated video streaming platform using P2P directly in your web browser
More precise from now interval
Chocobozzz7d5e80c95e65
diff --git a/client/src/app/shared/shared-main/date/from-now.pipe.ts b/client/src/app/shared/shared-main/date/from-now.pipe.tsindex 85f1a7abc0..1d23958ddc 100644--- a/client/src/app/shared/shared-main/date/from-now.pipe.ts+++ b/client/src/app/shared/shared-main/date/from-now.pipe.ts@@ -10,60 +10,80 @@ export class FromNowPipe implements PipeTransform {transform (arg: number | Date | string) {const argDate = new Date(arg)const seconds = Math.round((Date.now() - argDate.getTime()) / 1000)+ const absSeconds = Math.abs(seconds)- let interval = Math.round(seconds / 31536000)- if (interval >= 1) {- return formatICU($localize`{interval, plural, =1 {1 year ago} other {{interval} years ago}}`, { interval })- }- if (interval <= -1) {- return formatICU($localize`{interval, plural, =1 {in 1 year} other {in {interval} years}}`, { interval: -interval })+ if (absSeconds >= 31536000) {+ const interval = Math.round(seconds / 31536000)++ if (interval >= 1) {+ return formatICU($localize`{interval, plural, =1 {1 year ago} other {{interval} years ago}}`, { interval })+ }+ if (interval <= -1) {+ return formatICU($localize`{interval, plural, =1 {in 1 year} other {in {interval} years}}`, { interval: -interval })+ }}- interval = Math.round(seconds / 2419200)- // 12 months = 360 days, but a year ~ 365 days- // Display "1 year ago" rather than "12 months ago"- if (interval >= 12) return $localize`1 year ago`- if (interval <= -12) return $localize`in 1 year`+ // 1 month ~= 30.44 days = 2627040 seconds+ if (absSeconds >= 2627040) {+ const interval = Math.round(seconds / 2627040)- if (interval >= 1) {- return formatICU($localize`{interval, plural, =1 {1 month ago} other {{interval} months ago}}`, { interval })- }- if (interval <= -1) {- return formatICU($localize`{interval, plural, =1 {in 1 month} other {in {interval} months}}`, { interval: -interval })+ // 12 months = 360 days, but a year ~ 365 days+ // Display "1 year ago" rather than "12 months ago"+ if (interval >= 12) return $localize`1 year ago`+ if (interval <= -12) return $localize`in 1 year`++ if (interval >= 1) {+ return formatICU($localize`{interval, plural, =1 {1 month ago} other {{interval} months ago}}`, { interval })+ }+ if (interval <= -1) {+ return formatICU($localize`{interval, plural, =1 {in 1 month} other {in {interval} months}}`, { interval: -interval })+ }}- interval = Math.round(seconds / 604800)- // 4 weeks ~ 28 days, but our month is 30 days- // Display "1 month ago" rather than "4 weeks ago"- if (interval >= 4) return $localize`1 month ago`- if (interval <= -4) return $localize`1 month from now`+ if (absSeconds >= 604800) {+ const interval = Math.round(seconds / 604800)- if (interval >= 1) {- return formatICU($localize`{interval, plural, =1 {1 week ago} other {{interval} weeks ago}}`, { interval })- }- if (interval <= -1) {- return formatICU($localize`{interval, plural, =1 {in 1 week} other {in {interval} weeks}}`, { interval: -interval })- }+ // 4 weeks ~ 28 days, but our month is 30 days+ // Display "1 month ago" rather than "4 weeks ago"+ if (interval >= 4) return $localize`1 month ago`+ if (interval <= -4) return $localize`1 month from now`- interval = Math.round(seconds / 86400)- if (interval >= 1) {- return formatICU($localize`{interval, plural, =1 {1 day ago} other {{interval} days ago}}`, { interval })- }- if (interval <= -1) {- return formatICU($localize`{interval, plural, =1 {in 1 day} other {in {interval} days}}`, { interval: -interval })+ if (interval >= 1) {+ return formatICU($localize`{interval, plural, =1 {1 week ago} other {{interval} weeks ago}}`, { interval })+ }+ if (interval <= -1) {+ return formatICU($localize`{interval, plural, =1 {in 1 week} other {in {interval} weeks}}`, { interval: -interval })+ }}- interval = Math.round(seconds / 3600)- if (interval >= 1) {- return formatICU($localize`{interval, plural, =1 {1 hour ago} other {{interval} hours ago}}`, { interval })+ if (absSeconds >= 86400) {+ const interval = Math.round(seconds / 86400)++ if (interval >= 1) {+ return formatICU($localize`{interval, plural, =1 {1 day ago} other {{interval} days ago}}`, { interval })+ }+ if (interval <= -1) {+ return formatICU($localize`{interval, plural, =1 {in 1 day} other {in {interval} days}}`, { interval: -interval })+ }}- if (interval <= -1) {- return formatICU($localize`{interval, plural, =1 {in 1 hour} other {in {interval} hours}}`, { interval: -interval })++ if (absSeconds >= 3600) {+ const interval = Math.round(seconds / 3600)++ if (interval >= 1) {+ return formatICU($localize`{interval, plural, =1 {1 hour ago} other {{interval} hours ago}}`, { interval })+ }+ if (interval <= -1) {+ return formatICU($localize`{interval, plural, =1 {in 1 hour} other {in {interval} hours}}`, { interval: -interval })+ }}- interval = Math.round(seconds / 60)- if (interval >= 1) return $localize`${interval} min ago`- if (interval <= -1) return $localize`in ${-interval} min`+ if (absSeconds >= 60) {+ const interval = Math.round(seconds / 60)++ if (interval >= 1) return $localize`${interval} min ago`+ if (interval <= -1) return $localize`in ${-interval} min`+ }return $localize`just now`}