@acorex/core 20.1.12 → 20.1.14

package/date-time/index.d.ts

@@ -270,8 +270,9 @@ declare module '@acorex/core/format' {
     }
 }
 declare class AXTimeLeftFormatter implements AXFormatter {
+    private translateService;
     get name(): string;
-    format(value: number | string, options?: AXTimeLeftFormatterOptions): string;
+    format(value: number | string | Date, options?: AXTimeLeftFormatterOptions): string;
     static ɵfac: i0.ɵɵFactoryDeclaration<AXTimeLeftFormatter, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<AXTimeLeftFormatter>;
 }

package/fesm2022/acorex-core-date-time.mjs

@@ -6,7 +6,7 @@ import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injectable, Pipe, NgModule } from '@angular/core';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { AX_GLOBAL_CONFIG } from '@acorex/core/config';
-import { defaults, orderBy, set, isNil } from 'lodash-es';
+import { defaults, orderBy, set, isNil, isDate } from 'lodash-es';
 import { isBrowser } from '@acorex/core/platform';
 import { translateSync, AXTranslationService } from '@acorex/core/translation';
 
@@ -215,7 +215,7 @@ class AXDateTime {
         const parts = formatter.formatToParts(new Date());
         // Map parts to their respective format
         const formatMap = {
-            day: 'dd',
+            day: 'DD',
             month: style == 'longDate' ? 'MMMM' : 'MM',
             year: 'yyyy',
             hour: 'HH',
@@ -1489,12 +1489,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.0.4", ngImpor
         }] });
 
 class AXTimeLeftFormatter {
+    constructor() {
+        this.translateService = inject(AXTranslationService);
+    }
     get name() {
         return 'timeleft';
     }
     format(value, options) {
-        const valueNumber = Number(value);
-        const sign = valueNumber >= 0 ? 'left' : 'ago';
+        if (isNil(value)) {
+            return '';
+        }
+        let valueNumber;
+        if (isDate(value)) {
+            valueNumber = value.getTime() - new Date().getTime();
+        }
+        else {
+            valueNumber = Number(value);
+        }
+        const sign = this.translateService.translateSync(`@acorex:time.${valueNumber >= 0 ? 'left' : 'ago'}`);
         const milliseconds = Math.abs(valueNumber);
         const durationInSeconds = Math.round(milliseconds / 1000);
         let format = options?.format;
@@ -1502,69 +1514,74 @@ class AXTimeLeftFormatter {
         if (isNil(format)) {
             if (durationInSeconds < 45)
                 format = 's';
-            else if (durationInSeconds < 60 * 45)
+            else if (durationInSeconds < 2700)
                 format = 'm';
-            else if (durationInSeconds < 60 * 60 * 22)
+            else if (durationInSeconds < 79200)
                 format = 'h';
-            else if (durationInSeconds < 60 * 60 * 24 * 26)
+            else if (durationInSeconds < 2246400)
                 format = 'd';
-            else if (durationInSeconds < 60 * 60 * 24 * 320)
+            else if (durationInSeconds < 27648000)
                 format = 'M';
             else
                 format = 'y';
         }
         // Helper function for zero-padding
         const pad = (num) => num.toString().padStart(2, '0');
+        const translate = (key, useSign = true) => {
+            const translated = this.translateService.translateSync(`@acorex:time.${key}`);
+            return useSign ? `${translated} ${sign}` : translated;
+        };
         switch (format) {
             case 's':
-                return `${durationInSeconds} seconds ${sign}`;
+                return `${durationInSeconds} ${translate('seconds')}`;
             case 'ss':
-                return `${pad(durationInSeconds)} seconds ${sign}`;
+                return `${pad(durationInSeconds)} ${translate('seconds')}`;
             case 'm':
-                return `${Math.round(durationInSeconds / 60)} minute${durationInSeconds >= 120 ? 's' : ''} ${sign}`;
+                return `${Math.round(durationInSeconds / 60)} ${translate(durationInSeconds >= 120 ? 'minutes' : 'minute')}`;
             case 'mm':
-                return `${pad(Math.round(durationInSeconds / 60))} minutes ${sign}`;
+                return `${pad(Math.round(durationInSeconds / 60))} ${translate('minutes')}`;
             case 'h':
             case 'H':
-                if (durationInSeconds < 60 * 89)
-                    return `an hour ${sign}`;
-                return `${Math.round(durationInSeconds / 3600)} hour${durationInSeconds >= 60 * 180 ? 's' : ''} ${sign}`;
+                if (durationInSeconds < 5340)
+                    return translate('an-hour');
+                return `${Math.round(durationInSeconds / 3600)} ${translate(durationInSeconds >= 10800 ? 'hours' : 'hour')}`;
             case 'hh':
             case 'HH':
-                if (durationInSeconds < 60 * 89)
-                    return `01 hour ${sign}`;
-                return `${pad(Math.round(durationInSeconds / 3600))} hours ${sign}`;
+                if (durationInSeconds < 5340)
+                    return `01 ${translate('hour')}`;
+                return `${pad(Math.round(durationInSeconds / 3600))} ${translate('hours')}`;
             case 'd':
             case 'D':
-                if (durationInSeconds < 60 * 60 * 35)
-                    return `a day ${sign}`;
-                return `${Math.round(durationInSeconds / (3600 * 24))} day${durationInSeconds >= 60 * 60 * 70 ? 's' : ''} ${sign}`;
+                if (durationInSeconds < 126000)
+                    return translate('a-day');
+                return `${Math.round(durationInSeconds / (3600 * 24))} ${translate(durationInSeconds >= 252000 ? 'days' : 'day')}`;
             case 'dd':
             case 'DD':
-                if (durationInSeconds < 60 * 60 * 35)
-                    return `01 day ${sign}`;
-                return `${pad(Math.round(durationInSeconds / (3600 * 24)))} days ${sign}`;
+                if (durationInSeconds < 126000)
+                    return `01 ${translate('day')}`;
+                return `${pad(Math.round(durationInSeconds / (3600 * 24)))} ${translate('days')}`;
             case 'M':
-                if (durationInSeconds < 60 * 60 * 24 * 45)
-                    return `a month ${sign}`;
-                return `${Math.round(durationInSeconds / (3600 * 24 * 30))} month${durationInSeconds >= 60 * 60 * 24 * 90 ? 's' : ''} ${sign}`;
+                if (durationInSeconds < 3888000)
+                    return translate('a-month');
+                return `${Math.round(durationInSeconds / (3600 * 24 * 30))} ${translate(durationInSeconds >= 7776000 ? 'months' : 'month')}`;
             case 'MM':
-                if (durationInSeconds < 60 * 60 * 24 * 45)
-                    return `01 month ${sign}`;
-                return `${pad(Math.round(durationInSeconds / (3600 * 24 * 30)))} months ${sign}`;
+                if (durationInSeconds < 3888000)
+                    return `01 ${translate('month')}`;
+                return `${pad(Math.round(durationInSeconds / (3600 * 24 * 30)))} ${translate('months')}`;
             case 'y':
             case 'Y':
-                if (durationInSeconds < 60 * 60 * 24 * 547)
-                    return `a year ${sign}`;
-                return `${Math.round(durationInSeconds / (3600 * 24 * 365))} year${durationInSeconds >= 60 * 60 * 24 * 730 ? 's' : ''} ${sign}`;
+                if (durationInSeconds < 47260800)
+                    return translate('a-year');
+                return `${Math.round(durationInSeconds / (3600 * 24 * 365))} ${translate(durationInSeconds >= 63072000 ? 'years' : 'year')}`;
             case 'yy':
             case 'YY':
             case 'yyyy':
             case 'YYYY':
-                if (durationInSeconds < 60 * 60 * 24 * 547)
-                    return `01 year ${sign}`;
-                return `${pad(Math.round(durationInSeconds / (3600 * 24 * 365)))} years ${sign}`;
+                if (durationInSeconds < 47260800)
+                    return `01 ${translate('year')}`;
+                return `${pad(Math.round(durationInSeconds / (3600 * 24 * 365)))} ${translate('years')}`;
             default:
+                console.error('Invalid format for timeleft formatter pipe');
                 return 'Invalid format';
         }
     }