Skip to content

Commit a07990a

Browse files
Changes from PR
1 parent e3e03e9 commit a07990a

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

src/app/admin/users/user-edit/user-edit.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
<input
105105
[formControl]="serializedExpirationDate"
106106
[matDatepicker]="expirationDatePicker"
107+
[min]="now"
107108
matInput
108109
/>
109110
<mat-datepicker-toggle [for]="expirationDatePicker" matSuffix></mat-datepicker-toggle>

src/app/admin/users/user-edit/user-edit.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export class UserEditComponent implements OnInit, OnDestroy {
3737
public canEdit: boolean;
3838
public permissionMultiCtrl: UntypedFormControl = new UntypedFormControl();
3939
serializedExpirationDate = new FormControl<Date | undefined>(undefined);
40+
protected readonly now = new Date();
4041
private _onDestroy = new Subject<void>();
4142

4243
constructor(

src/app/shared/pipes/custom-date.pipe.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class CustomDatePipeWithSecondsNoPrefix extends DatePipe implements PipeT
3333
})
3434
export class CustomTableDatePipe extends DatePipe implements PipeTransform {
3535
transform(value: any, args?: any): any {
36-
return super.transform(value, "dd MMM, yyyy - HH:mm");
36+
return super.transform(value, "dd-MM-yyyy kl. HH:mm");
3737
}
3838
}
3939

@@ -42,7 +42,7 @@ export class CustomTableDatePipe extends DatePipe implements PipeTransform {
4242
})
4343
export class CustomTableDateWithSecondsPipe extends DatePipe implements PipeTransform {
4444
transform(value: any, args?: any): any {
45-
return super.transform(value, "dd MMM, yyyy - HH:mm:ss");
45+
return super.transform(value, "dd-MM-yyyy - HH:mm:ss");
4646
}
4747
}
4848

@@ -51,6 +51,6 @@ export class CustomTableDateWithSecondsPipe extends DatePipe implements PipeTran
5151
})
5252
export class DateOnlyPipe extends DatePipe implements PipeTransform {
5353
transform(value: any, args?: any): any {
54-
return super.transform(value, "dd MMM, yyyy");
54+
return super.transform(value, "dd-MM-yyyy");
5555
}
5656
}

src/assets/i18n/da.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,16 +1317,16 @@
13171317
"CANCEL": "Annuller",
13181318
"SAVE": "Gem nøgle",
13191319
"CREATE-API-KEY": "Opret nøgle",
1320-
"EXPIRATION-DATE": "Udløbsdato",
1321-
"EXPIRATION-DATE-PLACEHOLDER": "Udløbsdato",
1320+
"EXPIRATION-DATE": "Deaktiveringsdato",
1321+
"EXPIRATION-DATE-PLACEHOLDER": "Deaktiveringsdato",
13221322
"EXPIRATION-DATE-DESCRIPTION": "Nøgle deaktiveres automatisk på denne dato"
13231323
},
13241324
"TABLE-ROW": {
13251325
"EDIT": "Redigér",
13261326
"DELETE": "Slet"
13271327
},
13281328
"STATUS": "Status",
1329-
"EXPIRES-ON": "Udløbsdato"
1329+
"EXPIRES-ON": "Deaktiveringsdato"
13301330
},
13311331
"NoUsersAdded": "Ingen brugergrupper er tilføjet",
13321332
"FIWARE": {

0 commit comments

Comments
 (0)