diff --git a/package.json b/package.json index f346714..0ed7e55 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "@angular/platform-browser": "^12.2.10", "@angular/platform-browser-dynamic": "^12.2.10", "@angular/router": "^12.2.10", - "moment": "^2.29.1", "ng-qrcode": "^5.1.1", "ngx-mat-timepicker": "^12.1.0", "openpgp": "^4.10.10", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index edba6ac..b840b5b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -153,14 +153,14 @@ export class XhrInterceptor implements HttpInterceptor { provide: NgxMatDateAdapter, useClass: NgxMatMomentAdapter, useFactory: (i18n: I18nService) => { - return new NgxMatMomentAdapter(i18n.getLocale()); + return new NgxMatMomentAdapter(i18n.getLocale(), { strict: true }); }, deps: [ I18nService ] }, { provide: NGX_MAT_DATE_FORMATS, useFactory: (i18n: I18nService) => { const datetimeformat = i18n.get('format.datetime', []); return { parse: { - dateInput: "l, LTS" + dateInput: datetimeformat }, display: { dateInput: datetimeformat, diff --git a/src/app/pages/borrow/items/item.edit.html b/src/app/pages/borrow/items/item.edit.html index 6d06b53..c9b2fea 100644 --- a/src/app/pages/borrow/items/item.edit.html +++ b/src/app/pages/borrow/items/item.edit.html @@ -90,7 +90,7 @@
- @@ -100,7 +100,7 @@ - diff --git a/src/app/pages/borrow/requests/request.edit.html b/src/app/pages/borrow/requests/request.edit.html index f890546..c3bc44c 100644 --- a/src/app/pages/borrow/requests/request.edit.html +++ b/src/app/pages/borrow/requests/request.edit.html @@ -23,7 +23,7 @@
- @@ -33,7 +33,7 @@ - diff --git a/src/app/pages/invites/invites.component.html b/src/app/pages/invites/invites.component.html index fc29594..a429cd6 100644 --- a/src/app/pages/invites/invites.component.html +++ b/src/app/pages/invites/invites.component.html @@ -29,12 +29,12 @@ {{'invite.starts' | i18n}} - {{ invite.starts | date:datetimeformat}} + {{ invite.starts | datef:datetimeformat}} {{'invite.expires' | i18n}} - {{ invite.expires | date:datetimeformat}} + {{ invite.expires | datef:datetimeformat}} diff --git a/src/app/pages/jitsi/jitsi.component.html b/src/app/pages/jitsi/jitsi.component.html index f3b4b86..178c3f3 100644 --- a/src/app/pages/jitsi/jitsi.component.html +++ b/src/app/pages/jitsi/jitsi.component.html @@ -35,18 +35,18 @@ {{'jitsi.rooms.starts' | i18n}} - {{ jitsiRoom.starts | date:datetimeformat}} + {{ jitsiRoom.starts | datef:datetimeformat}} {{'jitsi.rooms.moderationStarts' | i18n}} - {{ jitsiRoom.moderationStarts | date:datetimeformat}} + {{ jitsiRoom.moderationStarts | datef:datetimeformat}} {{'jitsi.rooms.expires' | i18n}} - {{ jitsiRoom.expires | date:datetimeformat}} + {{ jitsiRoom.expires | datef:datetimeformat}} @@ -107,7 +107,7 @@ - @@ -117,7 +117,7 @@ - @@ -127,7 +127,7 @@ - diff --git a/src/app/pages/jitsi/jitsi.edit.html b/src/app/pages/jitsi/jitsi.edit.html index 70f6f0f..5c978fe 100644 --- a/src/app/pages/jitsi/jitsi.edit.html +++ b/src/app/pages/jitsi/jitsi.edit.html @@ -12,7 +12,7 @@ - @@ -22,7 +22,7 @@ - @@ -32,7 +32,7 @@ - diff --git a/src/app/pages/partey/timeslots/timeslot.dialog.html b/src/app/pages/partey/timeslots/timeslot.dialog.html index 7c5df07..8cf64b2 100644 --- a/src/app/pages/partey/timeslots/timeslot.dialog.html +++ b/src/app/pages/partey/timeslots/timeslot.dialog.html @@ -17,7 +17,7 @@ - @@ -26,7 +26,7 @@ - diff --git a/src/app/pages/partey/timeslots/timeslots.component.html b/src/app/pages/partey/timeslots/timeslots.component.html index 75d3def..de5e1c3 100644 --- a/src/app/pages/partey/timeslots/timeslots.component.html +++ b/src/app/pages/partey/timeslots/timeslots.component.html @@ -28,7 +28,7 @@ - @@ -37,12 +37,12 @@ - + - + diff --git a/src/app/pages/urlshortener/urlshortener.component.html b/src/app/pages/urlshortener/urlshortener.component.html index 86c64e0..5625e97 100644 --- a/src/app/pages/urlshortener/urlshortener.component.html +++ b/src/app/pages/urlshortener/urlshortener.component.html @@ -46,7 +46,7 @@ - + @@ -124,7 +124,7 @@ - diff --git a/src/app/pages/urlshortener/urlshortener.edit.html b/src/app/pages/urlshortener/urlshortener.edit.html index 40be34c..d0ec7f7 100644 --- a/src/app/pages/urlshortener/urlshortener.edit.html +++ b/src/app/pages/urlshortener/urlshortener.edit.html @@ -49,7 +49,7 @@ - diff --git a/src/app/ui/permissions/permissions.component.html b/src/app/ui/permissions/permissions.component.html index bba15ba..b1fbeaf 100644 --- a/src/app/ui/permissions/permissions.component.html +++ b/src/app/ui/permissions/permissions.component.html @@ -12,12 +12,12 @@ - + - + diff --git a/src/app/ui/profilefields/profilefield.dialog.html b/src/app/ui/profilefields/profilefield.dialog.html index f335593..27d8614 100644 --- a/src/app/ui/profilefields/profilefield.dialog.html +++ b/src/app/ui/profilefields/profilefield.dialog.html @@ -38,7 +38,7 @@ - diff --git a/src/app/ui/profilefields/profilefields.component.html b/src/app/ui/profilefields/profilefields.component.html index affc4b0..99fec43 100644 --- a/src/app/ui/profilefields/profilefields.component.html +++ b/src/app/ui/profilefields/profilefields.component.html @@ -10,9 +10,9 @@
{{'partey.timeslots.starts' | i18n}} {{ timeslot.starts | date:datetimeformat}} {{ timeslot.starts | datef:datetimeformat}} {{'partey.timeslots.ends' | i18n}} {{ timeslot.ends | date:datetimeformat}} {{ timeslot.ends | datef:datetimeformat}} {{'urlshortener.expires' | i18n}} {{ shortenedUrl.expires | date:datetimeformat}} {{ shortenedUrl.expires | datef:datetimeformat}} {{'permissions.starts' | i18n}} {{permission.starts | date:datetimeformat}}{{permission.starts | datef:datetimeformat}} {{'permissions.expires' | i18n}} {{permission.expires | date:datetimeformat}}{{permission.expires | datef:datetimeformat}}
{{profileField.value}} - {{profileField.value | date:dateformat}} - {{profileField.value | date:datetimeformat}} - {{profileField.value | date:timeformat}} + {{profileField.value | datef:dateformat}} + {{profileField.value | datef:datetimeformat}} + {{profileField.value | datef:timeformat}} {{profileField.value}} {{profileField.value}} {{profileField.value}}