Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i18n related Label tweaks #1117

Merged
merged 2 commits into from
Feb 10, 2024
Merged

i18n related Label tweaks #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec0c175
fix dismissible error alert and fix a11y
auumgn Feb 9, 2024
6e5f908
i18n related label tweaks
auumgn Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ui/src/app/shared/alert/alert.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@
<ngb-alert *ngIf="alert && alert.type && alert.msg" [type]="alert.type" [dismissible]="false" class="alert-success">
<div class="d-flex">
<div class="font-size-16 flex-grow-1">{{ alert.msg | localize }}</div>
<a (click)="close(alert)" (keyup)="closeOldestAlert()" tabindex="0" class="close">×</a>
<a
(click)="close(alert)"
(keyup.esc)="closeOldestAlert()"
(keyup.enter)="closeOldestAlert()"
tabindex="0"
class="close"
>×</a
>
</div>
</ngb-alert>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/user/user-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row justify-content-center">
<div class="col-8">
<div *ngIf="user">
<h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">User Settings</h1>
<h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">User details</h1>
<hr />
<app-error-alert></app-error-alert>
<div class="row">
Expand Down Expand Up @@ -104,7 +104,7 @@ <h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">Use
</button>
<button *ngIf="!user.activated" type="button" (click)="sendActivate()" class="btn btn-primary btn-sm ml-1">
<fa-icon [icon]="faCheckCircle"></fa-icon>
<span class="d-none d-md-inline" i18n="@@entity.action.activate.string">Activate</span>
<span class="d-none d-md-inline" i18n="@@entity.action.activate.string">Resend activation email</span>
</button>
</div>
</div>
Expand Down
12 changes: 10 additions & 2 deletions ui/src/app/user/user-update.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="col-8">
<form name="editForm" role="form" novalidate [formGroup]="editForm">
<h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.home.createOrEditLabel.string">
Create or edit a User Settings
Add or edit user
</h1>
<div>
<app-alert></app-alert>
Expand All @@ -11,13 +11,21 @@ <h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser
class="alert alert-danger alert-dismissible"
role="alert"
ng-reflect-type="danger"
(close)="validation.errors = null"
[dismissible]="false"
>
<ul class="validation-errors">
<li *ngFor="let error of validation.errors">
{{ error }}
</li>
</ul>
<a
(click)="validation.errors = null"
(keyup.esc)="validation.errors = null"
(keyup.enter)="validation.errors = null"
tabindex="0"
class="close"
>×</a
>
</ngb-alert>
</div>
<div class="form-group">
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/user/users.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.msUserServiceMSUser.home.t
class="btn btn-primary btn-sm ml-1"
>
<fa-icon [icon]="faCheckCircle"></fa-icon>
<span class="d-none d-md-inline" i18n="@@entity.action.activate.string">Activate</span>
<span class="d-none d-md-inline" i18n="@@entity.action.activate.string">Resend activation email</span>
</button>
<button
type="submit"
Expand Down
Loading