Merge pull request #1223 from jumpserver/pr@dev@feat_add_translate

feat: add translate
jumpserver · Jan 14, 2025 · ebbbbac · ebbbbac
2 parents 24a3a81 + 5357165
commit ebbbbac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/app/services/connect-token/acl-dialog/acl-dialog.component.html b/src/app/services/connect-token/acl-dialog/acl-dialog.component.html
@@ -23,7 +23,7 @@ <h2 mat-dialog-title> {{ 'Login reminder' | translate }} </h2>
 
     <div *ngSwitchCase="'acl_face_online_not_supported'">
       <mat-dialog-content>
-        <div class="error-message">{{ 'ACL action "Face Online" not supported for this asset.' |translate }}</div>
+        <div class="error-message">{{errorDetail }}</div>
       </mat-dialog-content>
       <mat-dialog-actions>
         <button (click)="closeDialog()" mat-raised-button>{{ "Close" | translate }}</button>

diff --git a/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts b/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts
@@ -49,6 +49,9 @@ export class ElementACLDialogComponent implements OnInit {
     if (Array.isArray(error)) {
       error = error.join(' ');
     } else if (typeof error === 'object') {
+      if (error.detail) {
+        error = error.detail;
+      }
       error = JSON.stringify(error);
     }
     return error;