From ac604f4e08f4eedb4b3f0719bbb69491aef83684 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Thu, 4 Oct 2018 10:33:15 +0200 Subject: [PATCH] Add manage user i18n replacements --- .../list-filter/list-filter.component.html | 3 +- .../list-filter/list-filter.component.ts | 3 ++ ...d.component.html => squads.component.html} | 0 ...d.component.scss => squads.component.scss} | 0 static/src/app/squads/squads.component.ts | 14 ++++++ static/src/app/squads/squads.module.ts | 2 +- static/src/app/squads/squads.routing.ts | 6 +-- .../award-user/award-user.component.html | 40 +++++++++-------- .../users/award-user/award-user.component.ts | 13 +++++- .../users/edit-user/edit-user.component.html | 25 +++++------ .../users/user-list/user-item.component.html | 8 ++-- .../users/user-list/user-list.component.html | 4 +- static/src/app/users/users.component.html | 1 + static/src/app/users/users.component.scss | 0 .../users.component.ts} | 8 ++-- static/src/app/users/users.module.ts | 24 +++++++++- static/src/app/users/users.routing.ts | 8 +++- .../src/assets/i18n/{squad => squads}/de.json | 0 .../src/assets/i18n/{squad => squads}/en.json | 0 static/src/assets/i18n/users/de.json | 44 +++++++++++++++++++ static/src/assets/i18n/users/en.json | 3 ++ 21 files changed, 157 insertions(+), 49 deletions(-) rename static/src/app/squads/{squad.component.html => squads.component.html} (100%) rename static/src/app/squads/{squad.component.scss => squads.component.scss} (100%) create mode 100644 static/src/app/squads/squads.component.ts create mode 100644 static/src/app/users/users.component.html create mode 100644 static/src/app/users/users.component.scss rename static/src/app/{squads/squad.component.ts => users/users.component.ts} (60%) rename static/src/assets/i18n/{squad => squads}/de.json (100%) rename static/src/assets/i18n/{squad => squads}/en.json (100%) create mode 100644 static/src/assets/i18n/users/de.json create mode 100644 static/src/assets/i18n/users/en.json diff --git a/static/src/app/common/user-interface/list-filter/list-filter.component.html b/static/src/app/common/user-interface/list-filter/list-filter.component.html index ece1414..905ed13 100644 --- a/static/src/app/common/user-interface/list-filter/list-filter.component.html +++ b/static/src/app/common/user-interface/list-filter/list-filter.component.html @@ -1,7 +1,8 @@
- {{button.label}} + {{button.label | translate}} + {{button.label}}
- - - - - + + + + + @@ -90,7 +92,9 @@ {{award.date | date: 'dd.MM.yyyy'}}
BildBezeichnungBegründungDatumStatus{{'users.award.table.head.image' | translate}}{{'users.award.table.head.name' | translate}}{{'users.award.table.head.reason' | translate}}{{'users.award.table.head.date' | translate}}{{'users.award.table.head.status' | translate}} - Löschen + + {{'users.award.table.button.delete' | translate}} +
- {{award.confirmed === 0 ? 'In Bearbeitung' : (award.confirmed === 1 ? 'Genehmigt' : 'Abgelehnt')}} + {{award.confirmed === 0 ? + awardStatus['users.award.table.status.in.progress'] : (award.confirmed === 1 ? + awardStatus['users.award.table.status.approved']: awardStatus['users.award.table.status.rejected'])}}