diff --git a/frontend/src/app/components/time-since/time-since.component.ts b/frontend/src/app/components/time-since/time-since.component.ts index e87ab9ab6..3acfc11c5 100644 --- a/frontend/src/app/components/time-since/time-since.component.ts +++ b/frontend/src/app/components/time-since/time-since.component.ts @@ -69,16 +69,8 @@ export class TimeSinceComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-since:${dateStrings.i18nWeek}:DATE: ago`; break; case 'day': return $localize`:@@time-since:${dateStrings.i18nDay}:DATE: ago`; break; case 'hour': return $localize`:@@time-since:${dateStrings.i18nHour}:DATE: ago`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-since:${dateStrings.i18nMin}:DATE: ago`; - } - return $localize`:@@time-since:${dateStrings.i18nMinute}:DATE: ago`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-since:${dateStrings.i18nSec}:DATE: ago`; - } - return $localize`:@@time-since:${dateStrings.i18nSecond}:DATE: ago`; + case 'minute': return $localize`:@@time-since:${dateStrings.i18nMinute}:DATE: ago`; + case 'second': return $localize`:@@time-since:${dateStrings.i18nSecond}:DATE: ago`; } } else { switch (i) { // plural (2 days) @@ -87,16 +79,8 @@ export class TimeSinceComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-since:${dateStrings.i18nWeeks}:DATE: ago`; break; case 'day': return $localize`:@@time-since:${dateStrings.i18nDays}:DATE: ago`; break; case 'hour': return $localize`:@@time-since:${dateStrings.i18nHours}:DATE: ago`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-since:${dateStrings.i18nMins}:DATE: ago`; - } - return $localize`:@@time-since:${dateStrings.i18nMinutes}:DATE: ago`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-since:${dateStrings.i18nSecs}:DATE: ago`; - } - return $localize`:@@time-since:${dateStrings.i18nSeconds}:DATE: ago`; + case 'minute': return $localize`:@@time-since:${dateStrings.i18nMinutes}:DATE: ago`; + case 'second': return $localize`:@@time-since:${dateStrings.i18nSeconds}:DATE: ago`; } } } diff --git a/frontend/src/app/components/time-span/time-span.component.ts b/frontend/src/app/components/time-span/time-span.component.ts index f5a0ca99f..81f64bc35 100644 --- a/frontend/src/app/components/time-span/time-span.component.ts +++ b/frontend/src/app/components/time-span/time-span.component.ts @@ -69,16 +69,8 @@ export class TimeSpanComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeek}:DATE:`; break; case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDay}:DATE:`; break; case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHour}:DATE:`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-span:After ${dateStrings.i18nMin}:DATE:`; - } - return $localize`:@@time-span:After ${dateStrings.i18nMinute}:DATE:`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-span:After ${dateStrings.i18nSec}:DATE:`; - } - return $localize`:@@time-span:After ${dateStrings.i18nSecond}:DATE:`; + case 'minute': return $localize`:@@time-span:After ${dateStrings.i18nMinute}:DATE:`; + case 'second': return $localize`:@@time-span:After ${dateStrings.i18nSecond}:DATE:`; } } else { switch (i) { // plural (2 days) @@ -87,16 +79,8 @@ export class TimeSpanComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-span:After ${dateStrings.i18nWeeks}:DATE:`; break; case 'day': return $localize`:@@time-span:After ${dateStrings.i18nDays}:DATE:`; break; case 'hour': return $localize`:@@time-span:After ${dateStrings.i18nHours}:DATE:`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-span:After ${dateStrings.i18nMins}:DATE:`; - } - return $localize`:@@time-span:After ${dateStrings.i18nMinutes}:DATE:`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-span:After ${dateStrings.i18nSecs}:DATE:`; - } - return $localize`:@@time-span:After ${dateStrings.i18nSeconds}:DATE:`; + case 'minute': return $localize`:@@time-span:After ${dateStrings.i18nMinutes}:DATE:`; + case 'second': return $localize`:@@time-span:After ${dateStrings.i18nSeconds}:DATE:`; } } } diff --git a/frontend/src/app/components/time-until/time-until.component.ts b/frontend/src/app/components/time-until/time-until.component.ts index 9ff0d9e0b..ee67e712b 100644 --- a/frontend/src/app/components/time-until/time-until.component.ts +++ b/frontend/src/app/components/time-until/time-until.component.ts @@ -70,16 +70,8 @@ export class TimeUntilComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeek}:DATE:`; break; case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDay}:DATE:`; break; case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHour}:DATE:`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-until:In ~${dateStrings.i18nMin}:DATE:`; - } - return $localize`:@@time-until:In ~${dateStrings.i18nMinute}:DATE:`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-until:In ~${dateStrings.i18nSec}:DATE:`; - } - return $localize`:@@time-until:In ~${dateStrings.i18nSecond}:DATE:`; + case 'minute': return $localize`:@@time-until:In ~${dateStrings.i18nMinute}:DATE:`; + case 'second': return $localize`:@@time-until:In ~${dateStrings.i18nSecond}:DATE:`; } } else { switch (i) { // plural (In ~2 days) @@ -88,16 +80,8 @@ export class TimeUntilComponent implements OnInit, OnChanges, OnDestroy { case 'week': return $localize`:@@time-until:In ~${dateStrings.i18nWeeks}:DATE:`; break; case 'day': return $localize`:@@time-until:In ~${dateStrings.i18nDays}:DATE:`; break; case 'hour': return $localize`:@@time-until:In ~${dateStrings.i18nHours}:DATE:`; break; - case 'minute': - if (document.body.clientWidth < 768) { - return $localize`:@@time-until:In ~${dateStrings.i18nMins}:DATE:`; - } - return $localize`:@@time-until:In ~${dateStrings.i18nMinutes}:DATE:`; - case 'second': - if (document.body.clientWidth < 768) { - return $localize`:@@time-until:In ~${dateStrings.i18nSecs}:DATE:`; - } - return $localize`:@@time-until:In ~${dateStrings.i18nSeconds}:DATE:`; + case 'minute': return $localize`:@@time-until:In ~${dateStrings.i18nMinutes}:DATE:`; + case 'second': return $localize`:@@time-until:In ~${dateStrings.i18nSeconds}:DATE:`; } } } diff --git a/frontend/src/app/shared/i18n/dates.ts b/frontend/src/app/shared/i18n/dates.ts index 24e8272c6..188adedf1 100644 --- a/frontend/src/app/shared/i18n/dates.ts +++ b/frontend/src/app/shared/i18n/dates.ts @@ -12,11 +12,7 @@ export const dates = (counter: number) => { i18nHours: $localize`:@@date-base.hours:${counter}:DATE: hours`, i18nMinute: $localize`:@@date-base.minute:${counter}:DATE: minute`, i18nMinutes: $localize`:@@date-base.minutes:${counter}:DATE: minutes`, - i18nMin: $localize`:@@date-base.min:${counter}:DATE: min`, - i18nMins: $localize`:@@date-base.mins:${counter}:DATE: mins`, i18nSecond: $localize`:@@date-base.second:${counter}:DATE: second`, i18nSeconds: $localize`:@@date-base.seconds:${counter}:DATE: seconds`, - i18nSec: $localize`:@@date-base.sec:${counter}:DATE: sec`, - i18nSecs: $localize`:@@date-base.secs:${counter}:DATE: secs`, } } \ No newline at end of file diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index f187ccad7..c9364b37a 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -2999,55 +2999,39 @@ src/app/components/time-since/time-since.component.ts - 74 + 72 src/app/components/time-since/time-since.component.ts - 76 + 73 + + + src/app/components/time-since/time-since.component.ts + 77 + + + src/app/components/time-since/time-since.component.ts + 78 src/app/components/time-since/time-since.component.ts 79 + + src/app/components/time-since/time-since.component.ts + 80 + src/app/components/time-since/time-since.component.ts 81 src/app/components/time-since/time-since.component.ts - 85 + 82 src/app/components/time-since/time-since.component.ts - 86 - - - src/app/components/time-since/time-since.component.ts - 87 - - - src/app/components/time-since/time-since.component.ts - 88 - - - src/app/components/time-since/time-since.component.ts - 89 - - - src/app/components/time-since/time-since.component.ts - 92 - - - src/app/components/time-since/time-since.component.ts - 94 - - - src/app/components/time-since/time-since.component.ts - 97 - - - src/app/components/time-since/time-since.component.ts - 99 + 83 @@ -3074,55 +3058,39 @@ src/app/components/time-span/time-span.component.ts - 74 + 72 src/app/components/time-span/time-span.component.ts - 76 + 73 + + + src/app/components/time-span/time-span.component.ts + 77 + + + src/app/components/time-span/time-span.component.ts + 78 src/app/components/time-span/time-span.component.ts 79 + + src/app/components/time-span/time-span.component.ts + 80 + src/app/components/time-span/time-span.component.ts 81 src/app/components/time-span/time-span.component.ts - 85 + 82 src/app/components/time-span/time-span.component.ts - 86 - - - src/app/components/time-span/time-span.component.ts - 87 - - - src/app/components/time-span/time-span.component.ts - 88 - - - src/app/components/time-span/time-span.component.ts - 89 - - - src/app/components/time-span/time-span.component.ts - 92 - - - src/app/components/time-span/time-span.component.ts - 94 - - - src/app/components/time-span/time-span.component.ts - 97 - - - src/app/components/time-span/time-span.component.ts - 99 + 83 @@ -3160,55 +3128,39 @@ src/app/components/time-until/time-until.component.ts - 75 + 73 src/app/components/time-until/time-until.component.ts - 77 + 74 + + + src/app/components/time-until/time-until.component.ts + 78 + + + src/app/components/time-until/time-until.component.ts + 79 src/app/components/time-until/time-until.component.ts 80 + + src/app/components/time-until/time-until.component.ts + 81 + src/app/components/time-until/time-until.component.ts 82 src/app/components/time-until/time-until.component.ts - 86 + 83 src/app/components/time-until/time-until.component.ts - 87 - - - src/app/components/time-until/time-until.component.ts - 88 - - - src/app/components/time-until/time-until.component.ts - 89 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 98 - - - src/app/components/time-until/time-until.component.ts - 100 + 84 @@ -3851,46 +3803,18 @@ 14 - - min - - src/app/shared/i18n/dates.ts - 15 - - - - mins - - src/app/shared/i18n/dates.ts - 16 - - second src/app/shared/i18n/dates.ts - 17 + 15 seconds src/app/shared/i18n/dates.ts - 18 - - - - sec - - src/app/shared/i18n/dates.ts - 19 - - - - secs - - src/app/shared/i18n/dates.ts - 20 + 16