From f972055ebfc05da0d43fe5394a997bb4c0b7507d Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Fri, 3 Nov 2023 15:07:23 +0100
Subject: [PATCH] Added translation for short role name position

---
 web/package.json                                |  2 +-
 .../short-role-names.component.html             | 17 +++++++++++------
 .../short-role-names.component.ts               |  2 +-
 web/src/assets/version.json                     |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/web/package.json b/web/package.json
index 86bb83f4..c01deb92 100644
--- a/web/package.json
+++ b/web/package.json
@@ -52,4 +52,4 @@
         "tslib": "^2.4.1",
         "typescript": "~4.9.5"
     }
-}
+}
\ No newline at end of file
diff --git a/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html b/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html
index 684e2e0e..bfceb38e 100644
--- a/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html
+++ b/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.html
@@ -3,7 +3,8 @@
 </h1>
 <div class="content-wrapper">
   <div class="content">
-    <p-table #dt [value]="shortRoleNames" [responsive]="true" responsiveLayout="stack" [breakpoint]="'720px'" dataKey="id" editMode="row" [rowHover]="true" [rows]="10"
+    <p-table #dt [value]="shortRoleNames" [responsive]="true" responsiveLayout="stack" [breakpoint]="'720px'"
+             dataKey="id" editMode="row" [rowHover]="true" [rows]="10"
              [rowsPerPageOptions]="[10,25,50]" [paginator]="true" [loading]="loading" [totalRecords]="totalRecords"
              [lazy]="true" (onLazyLoad)="nextPage($event)">
 
@@ -17,12 +18,14 @@
               {{'view.server.short_role_names.short_role_names' | translate}}
             </div>
 
-            <app-multi-select-columns [table]="name" [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
+            <app-multi-select-columns [table]="name" [columns]="columns"
+                                      [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
           </div>
 
           <div class="table-caption-btn-wrapper btn-wrapper">
             <button pButton label="{{'common.add' | translate}}" class="icon-btn btn"
-                    icon="pi pi-plus" (click)="addShortRoleName(dt)" [disabled]="isEditingNew || user?.isModerator && !user?.isAdmin">
+                    icon="pi pi-plus" (click)="addShortRoleName(dt)"
+                    [disabled]="isEditingNew || user?.isModerator && !user?.isAdmin">
             </button>
             <button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
                     class="icon-btn btn" (click)="resetFilters()">
@@ -102,7 +105,8 @@
           </th>
           <th hideable-th="position" [parent]="this">
             <form [formGroup]="filterForm">
-              <p-dropdown formControlName="position" [options]="positions" placeholder="{{'common.position' | translate}}"></p-dropdown>
+              <p-dropdown formControlName="position" [options]="positions"
+                          placeholder="{{'common.position' | translate}}"></p-dropdown>
             </form>
           </th>
           <th class="table-header-small-dropdown"></th>
@@ -158,7 +162,7 @@
                             placeholder="{{'common.position' | translate}}"></p-dropdown>
               </ng-template>
               <ng-template pTemplate="output">
-                {{shortRoleName.position}}
+                {{ 'common.positions.' + shortRoleName.position | translate }}
               </ng-template>
             </p-cellEditor>
           </td>
@@ -187,7 +191,8 @@
           </td>
           <td>
             <div class="btn-wrapper">
-              <app-history-btn *ngIf="!isEditingNew" [id]="shortRoleName.id" [query]="query" translationKey="view.server.short_role_names.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [id]="shortRoleName.id" [query]="query"
+                               translationKey="view.server.short_role_names.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
                       (click)="onRowEditInit(dt, shortRoleName, ri)"></button>
               <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
diff --git a/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.ts b/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.ts
index 8202fd5f..f20fe69e 100644
--- a/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.ts
+++ b/web/src/app/modules/view/server/short-role-name/components/short-role-names/short-role-names.component.ts
@@ -102,7 +102,7 @@ export class ShortRoleNamesComponent extends ComponentWithTable implements OnIni
         if (data.shortRoleNamePositions) {
           this.positions = data.shortRoleNamePositions
             .map(x => {
-              return { label: x, value: x };
+              return { label: this.translate.instant(`common.positions.${x}`), value: x };
             });
         }
         this.spinner.hideSpinner();
diff --git a/web/src/assets/version.json b/web/src/assets/version.json
index c6ada89c..3ae731e3 100644
--- a/web/src/assets/version.json
+++ b/web/src/assets/version.json
@@ -4,4 +4,4 @@
         "Minor": "2",
         "Micro": "0"
     }
-}
+}
\ No newline at end of file