diff --git a/frontend/app/src/app/modules/schedule/page/schedule-view.html b/frontend/app/src/app/modules/schedule/page/schedule-view.html
index 91b99a03..7c6e9bf3 100644
--- a/frontend/app/src/app/modules/schedule/page/schedule-view.html
+++ b/frontend/app/src/app/modules/schedule/page/schedule-view.html
@@ -25,7 +25,7 @@
-
+
{{ i + hoursRange.from }}
diff --git a/frontend/app/src/app/modules/schedule/schedule.module.ts b/frontend/app/src/app/modules/schedule/schedule.module.ts
index e5812292..62d85122 100644
--- a/frontend/app/src/app/modules/schedule/schedule.module.ts
+++ b/frontend/app/src/app/modules/schedule/schedule.module.ts
@@ -35,7 +35,7 @@ import {InfiniteSwiperComponent} from './page/grid/infinite-swiper.component';
import {CalendarComponent} from './page/components/calendar.component';
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
import {ChooseEventsPageComponent} from './page/choose-events-page.component';
-import {AddDaysPipeModule, DateFnsModule, FormatPipeModule, IsSameDayPipeModule} from 'ngx-date-fns';
+import {AddDaysPipeModule, FormatPurePipeModule, IsSameDayPipeModule, IsTodayPipeModule} from 'ngx-date-fns';
const settingsRoutes: Routes = [
{path: 'schedule', redirectTo: 'schedule/calendar/now'},
@@ -76,9 +76,9 @@ const settingsRoutes: Routes = [
UtilModule,
ThingTranslateModule,
AddDaysPipeModule,
- FormatPipeModule,
IsSameDayPipeModule,
- DateFnsModule,
+ FormatPurePipeModule,
+ IsTodayPipeModule,
],
providers: [ScheduleProvider, DataProvider],
})
diff --git a/frontend/app/src/app/translation/dfns-locale.ts b/frontend/app/src/app/translation/dfns-locale.ts
index 28ed9a49..c362c1cf 100644
--- a/frontend/app/src/app/translation/dfns-locale.ts
+++ b/frontend/app/src/app/translation/dfns-locale.ts
@@ -15,6 +15,7 @@
import {SCLanguageCode} from '@openstapps/core';
import type {Locale} from 'date-fns';
import {TranslateService} from '@ngx-translate/core';
+import {firstValueFrom} from 'rxjs';
export interface LocaleExtension extends Locale {
formatFrequencyOptions: Partial
>;
@@ -46,9 +47,8 @@ export async function getDateFnsLocale(
console.warn(`Unknown Locale "${code}" for Date Fns. Falling back to English.`);
}
const key = code in LOCALES ? (code as keyof typeof LOCALES) : 'en';
- const translations = translator.translations[translator.currentLang];
- const frequencyExtension = translations['dateFns']['FORMAT_FREQUENCY'];
- const relativeDateExtension = translations['dateFns']['FORMAT_RELATIVE_DATE'];
+ const frequencyExtension = await firstValueFrom(translator.get('dateFns.FORMAT_FREQUENCY'));
+ const relativeDateExtension = await firstValueFrom(translator.get('dateFns.FORMAT_RELATIVE_DATE'));
return LOCALES[key]().then(it => {
const locale = it.default as LocaleExtension;
diff --git a/frontend/app/src/app/translation/property-name-translate.pipe.ts b/frontend/app/src/app/translation/property-name-translate.pipe.ts
index 4b30b33e..9c55c6b3 100644
--- a/frontend/app/src/app/translation/property-name-translate.pipe.ts
+++ b/frontend/app/src/app/translation/property-name-translate.pipe.ts
@@ -41,9 +41,9 @@ export class PropertyNameTranslatePipe implements PipeTransform, OnDestroy {
this.value = this.thingTranslate.getPropertyName(type as SCThingType, key);
}
- transform(query: unknown, thingOrType: SCThings | string | unknown): unknown {
+ transform(query: unknown, thingOrType: SCThings | string | unknown): string {
if (typeof query !== 'string' || query.length <= 0) {
- return query;
+ return query as string;
}
if (!isThing(thingOrType) && typeof thingOrType !== 'string') {
@@ -70,7 +70,7 @@ export class PropertyNameTranslatePipe implements PipeTransform, OnDestroy {
});
}
- return this.value;
+ return this.value as string;
}
/**
diff --git a/frontend/app/src/app/util/opening-hours.html b/frontend/app/src/app/util/opening-hours.html
index 8ac3b7ce..e10e08c9 100644
--- a/frontend/app/src/app/util/opening-hours.html
+++ b/frontend/app/src/app/util/opening-hours.html
@@ -22,11 +22,11 @@
{{ ('common.openingHours.' + openingHours.nextChangeAction + '_soon') | translate: {duration:
- (openingHours.nextChangeSoon | async | dfnsFormatDistanceToNowStrict: {unit: 'minute'})} }}
+ (openingHours.nextChangeSoon | async | dfnsFormatDistanceToNowStrictPure: {unit: 'minute'})} }}
{{ ('common.openingHours.' + openingHours.nextChangeAction) | translate: {date: openingHours.nextChange
- | dfnsFormatRelativeToNow} }}
+ | dfnsFormatRelativeToNowPure} }}
diff --git a/frontend/app/src/app/util/util.module.ts b/frontend/app/src/app/util/util.module.ts
index 9d5c5692..61b61f9d 100644
--- a/frontend/app/src/app/util/util.module.ts
+++ b/frontend/app/src/app/util/util.module.ts
@@ -27,7 +27,7 @@ import {SearchbarAutofocusDirective} from './searchbar-autofocus.directive';
import {SectionComponent} from './section.component';
import {RouterModule} from '@angular/router';
import {IonContentParallaxDirective} from './ion-content-parallax.directive';
-import {FormatDistanceToNowStrictPipeModule, FormatRelativeToNowPipeModule} from 'ngx-date-fns';
+import {FormatDistanceToNowStrictPurePipeModule, FormatRelativeToNowPurePipeModule} from 'ngx-date-fns';
@NgModule({
imports: [
@@ -36,8 +36,8 @@ import {FormatDistanceToNowStrictPipeModule, FormatRelativeToNowPipeModule} from
TranslateModule,
ThingTranslateModule.forChild(),
RouterModule,
- FormatRelativeToNowPipeModule,
- FormatDistanceToNowStrictPipeModule,
+ FormatRelativeToNowPurePipeModule,
+ FormatDistanceToNowStrictPurePipeModule,
],
declarations: [
IonContentParallaxDirective,
diff --git a/frontend/app/src/assets/i18n/de.json b/frontend/app/src/assets/i18n/de.json
index 74efa6e3..f1149016 100644
--- a/frontend/app/src/assets/i18n/de.json
+++ b/frontend/app/src/assets/i18n/de.json
@@ -18,7 +18,7 @@
"yesterday": "'gestern'",
"today": "'heute'",
"tomorrow": "'morgen'",
- "nextWeek": "'nächsten' eeee",
+ "nextWeek": "eeee",
"other": "pp"
}
},
diff --git a/frontend/app/src/assets/i18n/en.json b/frontend/app/src/assets/i18n/en.json
index b8c950a3..8a0daa46 100644
--- a/frontend/app/src/assets/i18n/en.json
+++ b/frontend/app/src/assets/i18n/en.json
@@ -18,7 +18,7 @@
"yesterday": "'yesterday'",
"today": "'today'",
"tomorrow": "'tomorrow'",
- "nextWeek": "'next' eeee",
+ "nextWeek": "eeee",
"other": "pp"
}
},