generator-jhipster 7.8.1 → 7.9.0

package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs

@@ -19,19 +19,19 @@
 <div>
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
-      <h2 <%= jhiPrefix %>Translate="settings.title" [translateValues]="{ username: account.login }" *ngIf="account">
-        User settings for [<strong>{{ account.login }}</strong>]
+      <h2 <%= jhiPrefix %>Translate="settings.title" [translateValues]="{ username: settingsForm.value.login }" *ngIf="settingsForm.value.login">
+        <%- this._getClientTranslation('settings.title', { username: '{{ settingsForm.value.login }}' }) %>
       </h2>
 
       <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="settings.messages.success">
-        <strong>Settings saved!</strong>
+          <%- this._getClientTranslation('settings.messages.success') %>
       </div>
 
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 
-      <form name="form" role="form" (ngSubmit)="save()" [formGroup]="settingsForm" *ngIf="account" novalidate>
+      <form name="form" role="form" (ngSubmit)="save()" [formGroup]="settingsForm" *ngIf="settingsForm.value.login" novalidate>
         <div class="mb-3">
-          <label class="form-label" for="firstName" <%= jhiPrefix %>Translate="settings.form.firstname">First Name</label>
+          <label class="form-label" for="firstName" <%= jhiPrefix %>Translate="settings.form.firstname"><%- this._getClientTranslation('settings.form.firstname') %></label>
           <input
             type="text"
             class="form-control"
@@ -53,7 +53,7 @@
               *ngIf="settingsForm.get('firstName')?.errors?.required"
               <%= jhiPrefix %>Translate="settings.messages.validate.firstname.required"
             >
-              Your first name is required.
+              <%- this._getClientTranslation('settings.messages.validate.firstname.required') %>
             </small>
 
             <small
@@ -61,7 +61,7 @@
               *ngIf="settingsForm.get('firstName')?.errors?.minlength"
               <%= jhiPrefix %>Translate="settings.messages.validate.firstname.minlength"
             >
-              Your first name is required to be at least 1 character.
+              <%- this._getClientTranslation('settings.messages.validate.firstname.minlength') %>
             </small>
 
             <small
@@ -69,13 +69,13 @@
               *ngIf="settingsForm.get('firstName')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="settings.messages.validate.firstname.maxlength"
             >
-              Your first name cannot be longer than 50 characters.
+              <%- this._getClientTranslation('settings.messages.validate.firstname.maxlength') %>
             </small>
           </div>
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="lastName" <%= jhiPrefix %>Translate="settings.form.lastname">Last Name</label>
+          <label class="form-label" for="lastName" <%= jhiPrefix %>Translate="settings.form.lastname"><%- this._getClientTranslation('settings.form.lastname') %></label>
           <input
             type="text"
             class="form-control"
@@ -97,7 +97,7 @@
               *ngIf="settingsForm.get('lastName')?.errors?.required"
               <%= jhiPrefix %>Translate="settings.messages.validate.lastname.required"
             >
-              Your last name is required.
+              <%- this._getClientTranslation('settings.messages.validate.lastname.required') %>
             </small>
 
             <small
@@ -105,7 +105,7 @@
               *ngIf="settingsForm.get('lastName')?.errors?.minlength"
               <%= jhiPrefix %>Translate="settings.messages.validate.lastname.minlength"
             >
-              Your last name is required to be at least 1 character.
+              <%- this._getClientTranslation('settings.messages.validate.lastname.minlength') %>
             </small>
 
             <small
@@ -113,13 +113,13 @@
               *ngIf="settingsForm.get('lastName')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="settings.messages.validate.lastname.maxlength"
             >
-              Your last name cannot be longer than 50 characters.
+               <%- this._getClientTranslation('settings.messages.validate.lastname.maxlength') %>
             </small>
           </div>
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label">Email</label>
+          <label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label"><%- this._getClientTranslation('global.form["email.label"]') %></label>
           <input
             type="email"
             class="form-control"
@@ -136,7 +136,7 @@
               *ngIf="settingsForm.get('email')?.errors?.required"
               <%= jhiPrefix %>Translate="global.messages.validate.email.required"
             >
-              Your email is required.
+              <%- this._getClientTranslation('global.messages.validate.email.required') %>
             </small>
 
             <small
@@ -144,7 +144,7 @@
               *ngIf="settingsForm.get('email')?.errors?.email"
               <%= jhiPrefix %>Translate="global.messages.validate.email.invalid"
             >
-              Your email is invalid.
+              <%- this._getClientTranslation('global.messages.validate.email.invalid') %>
             </small>
 
             <small
@@ -152,7 +152,7 @@
               *ngIf="settingsForm.get('email')?.errors?.minlength"
               <%= jhiPrefix %>Translate="global.messages.validate.email.minlength"
             >
-              Your email is required to be at least 5 characters.
+              <%- this._getClientTranslation('global.messages.validate.email.minlength') %>
             </small>
 
             <small
@@ -160,14 +160,14 @@
               *ngIf="settingsForm.get('email')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="global.messages.validate.email.maxlength"
             >
-              Your email cannot be longer than 100 characters.
+              <%- this._getClientTranslation('global.messages.validate.email.maxlength') %>
             </small>
           </div>
         </div>
         <%_ if (enableTranslation) { _%>
 
         <div class="mb-3" *ngIf="languages && languages.length > 0">
-          <label for="langKey" <%= jhiPrefix %>Translate="settings.form.language">Language</label>
+          <label for="langKey" <%= jhiPrefix %>Translate="settings.form.language"><%- this._getClientTranslation('settings.form.language') %></label>
           <select class="form-control" id="langKey" name="langKey" formControlName="langKey" data-cy="langKey">
             <option *ngFor="let language of languages" [value]="language">{{ language | findLanguageFromKey }}</option>
           </select>
@@ -181,7 +181,7 @@
           <%= jhiPrefix %>Translate="settings.form.button"
           data-cy="submit"
         >
-          Save
+          <%- this._getClientTranslation('settings.form.button') %>
         </button>
       </form>
     </div>

package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs

@@ -91,7 +91,7 @@ describe('SettingsComponent', () => {
     expect(mockAccountService.identity).toHaveBeenCalled();
     expect(mockAccountService.save).toHaveBeenCalledWith(account);
     expect(mockAccountService.authenticate).toHaveBeenCalledWith(account);
-    expect(comp.settingsForm.value).toEqual(settingsFormValues);
+    expect(comp.settingsForm.value).toMatchObject(expect.objectContaining(settingsFormValues));
   });
 
   it('should notify of success upon successful save', () => {

package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, Validators } from '@angular/forms';
+import { FormGroup, FormControl, Validators } from '@angular/forms';
 <%_ if (enableTranslation) { _%>
 import { TranslateService } from '@ngx-translate/core';
 <%_ } _%>
@@ -28,46 +28,50 @@ import { Account } from 'app/core/auth/account.model';
 import { LANGUAGES } from 'app/config/language.constants';
 <%_ } _%>
 
+const initialAccount: Account = {} as Account;
+
 @Component({
   selector: '<%= jhiPrefixDashed %>-settings',
   templateUrl: './settings.component.html',
 })
 export class SettingsComponent implements OnInit {
-  account!: Account;
   success = false;
-  <%_ if (enableTranslation) { _%>
+<%_ if (enableTranslation) { _%>
   languages = LANGUAGES;
-  <%_ } _%>
-  settingsForm = this.fb.group({
-    firstName: [undefined, [Validators.required, Validators.minLength(1), Validators.maxLength(50)]],
-    lastName: [undefined, [Validators.required, Validators.minLength(1), Validators.maxLength(50)]],
-    email: [undefined, [Validators.required, Validators.minLength(5), Validators.maxLength(254), Validators.email]],
-    <%_ if (enableTranslation) { _%>
-    langKey: [undefined],
-    <%_ } _%>
+<%_ } _%>
+
+  settingsForm = new FormGroup({
+    firstName: new FormControl(initialAccount.firstName, {
+      nonNullable: true,
+      validators: [Validators.required, Validators.minLength(1), Validators.maxLength(50)],
+    }),
+    lastName: new FormControl(initialAccount.lastName, {
+      nonNullable: true,
+      validators: [Validators.required, Validators.minLength(1), Validators.maxLength(50)],
+    }),
+    email: new FormControl(initialAccount.email, {
+      nonNullable: true,
+      validators: [Validators.required, Validators.minLength(5), Validators.maxLength(254), Validators.email],
+    }),
+    langKey: new FormControl(initialAccount.langKey, { nonNullable: true }),
+
+    activated: new FormControl(initialAccount.activated, { nonNullable: true }),
+    authorities: new FormControl(initialAccount.authorities, { nonNullable: true }),
+    imageUrl: new FormControl(initialAccount.imageUrl, { nonNullable: true }),
+    login: new FormControl(initialAccount.login, { nonNullable: true }),
   });
 
   constructor(
     private accountService: AccountService,
-    private fb: FormBuilder,
-    <%_ if (enableTranslation) { _%>
+<%_ if (enableTranslation) { _%>
     private translateService: TranslateService,
-    <%_ } _%>
+<%_ } _%>
   ) {}
 
   ngOnInit(): void {
     this.accountService.identity().subscribe(account => {
       if (account) {
-        this.settingsForm.patchValue({
-          firstName: account.firstName,
-          lastName: account.lastName,
-          email: account.email,
-          <%_ if (enableTranslation) { _%>
-          langKey: account.langKey,
-          <%_ } _%>
-        });
-
-        this.account = account;
+        this.settingsForm.patchValue(account);
       }
     });
   }
@@ -75,23 +79,17 @@ export class SettingsComponent implements OnInit {
   save(): void {
     this.success = false;
 
-    this.account.firstName = this.settingsForm.get('firstName')!.value;
-    this.account.lastName = this.settingsForm.get('lastName')!.value;
-    this.account.email = this.settingsForm.get('email')!.value;
-    <%_ if (enableTranslation) { _%>
-    this.account.langKey = this.settingsForm.get('langKey')!.value;
-    <%_ } _%>
-
-    this.accountService.save(this.account).subscribe(() => {
+    const account = this.settingsForm.getRawValue();
+    this.accountService.save(account).subscribe(() => {
       this.success = true;
 
-      this.accountService.authenticate(this.account);
+      this.accountService.authenticate(account);
 
-      <%_ if (enableTranslation) { _%>
-      if (this.account.langKey !== this.translateService.currentLang) {
-        this.translateService.use(this.account.langKey);
+<%_ if (enableTranslation) { _%>
+      if (account.langKey !== this.translateService.currentLang) {
+        this.translateService.use(account.langKey);
       }
-      <%_ } _%>
+<%_ } _%>
     });
   }
 }

package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs

@@ -17,9 +17,9 @@
  limitations under the License.
 -%>
 <div *ngIf="allBeans">
-  <h2 id="configuration-page-heading" <%= jhiPrefix %>Translate="configuration.title" data-cy="configurationPageHeading">Configuration</h2>
+  <h2 id="configuration-page-heading" <%= jhiPrefix %>Translate="configuration.title" data-cy="configurationPageHeading"><%- this._getClientTranslation('configuration.title') %></h2>
 
-  <span <%= jhiPrefix %>Translate="configuration.filter">Filter (by prefix)</span>
+  <span <%= jhiPrefix %>Translate="configuration.filter"><%- this._getClientTranslation('configuration.filter') %></span>
   <input type="text" [(ngModel)]="beansFilter" (ngModelChange)="filterAndSortBeans()" class="form-control" />
 
   <h3 id="spring-configuration">Spring configuration</h3>
@@ -28,9 +28,9 @@
     <thead>
       <tr <%= jhiPrefix %>Sort predicate="prefix" [(ascending)]="beansAscending" (sortChange)="filterAndSortBeans()">
         <th <%= jhiPrefix %>SortBy="prefix" scope="col" class="w-40">
-          <span <%= jhiPrefix %>Translate="configuration.table.prefix">Prefix</span> <fa-icon icon="sort"></fa-icon>
+          <span <%= jhiPrefix %>Translate="configuration.table.prefix"><%- this._getClientTranslation('configuration.table.prefix') %></span> <fa-icon icon="sort"></fa-icon>
         </th>
-        <th scope="col" class="w-60"><span <%= jhiPrefix %>Translate="configuration.table.properties">Properties</span></th>
+        <th scope="col" class="w-60"><span <%= jhiPrefix %>Translate="configuration.table.properties"><%- this._getClientTranslation('configuration.table.properties') %></span></th>
       </tr>
     </thead>
     <tbody>

package/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs

@@ -18,22 +18,22 @@
 -%>
 <div>
   <h2>
-    <span id="gateway-page-heading" <%= jhiPrefix %>Translate="gateway.title">Gateway</span>
+    <span id="gateway-page-heading" <%= jhiPrefix %>Translate="gateway.title"><%- this._getClientTranslation('gateway.title') %></span>
 
     <button class="btn btn-primary float-end" (click)="refresh()" (disabled)="updatingRoutes">
-      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="gateway.refresh.button">Refresh</span>
+      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="gateway.refresh.button"><%- this._getClientTranslation('gateway.refresh.button') %></span>
     </button>
   </h2>
 
-  <h3 <%= jhiPrefix %>Translate="gateway.routes.title">Current routes</h3>
+  <h3 <%= jhiPrefix %>Translate="gateway.routes.title"><%- this._getClientTranslation('gateway.routes.title') %></h3>
 
   <div class="table-responsive">
     <table class="table table-striped" aria-describedby="gateway-page-heading">
       <thead>
         <tr>
-          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.url">URL</th>
-          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.service">Service</th>
-          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.servers">Available servers</th>
+          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.url"><%- this._getClientTranslation('gateway.routes.url') %></th>
+          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.service"><%- this._getClientTranslation('gateway.routes.service') %></th>
+          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.servers"><%- this._getClientTranslation('gateway.routes.servers') %></th>
         </tr>
       </thead>
       <tbody>
@@ -42,7 +42,7 @@
           <td>{{ route.serviceId }}</td>
           <td>
             <div *ngIf="route.serviceInstances.length === 0" class="label label-danger" <%= jhiPrefix %>Translate="gateway.routes.error">
-              Warning: no server available!
+              <%- this._getClientTranslation('gateway.routes.error') %>
             </div>
 
             <div class="table-responsive">

package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs

@@ -18,10 +18,10 @@
 -%>
 <div>
   <h2>
-    <span id="health-page-heading" <%= jhiPrefix %>Translate="health.title" data-cy="healthPageHeading">Health Checks</span>
+    <span id="health-page-heading" <%= jhiPrefix %>Translate="health.title" data-cy="healthPageHeading"><%- this._getClientTranslation('health.title') %></span>
 
     <button class="btn btn-primary float-end" (click)="refresh()">
-      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="health.refresh.button">Refresh</span>
+      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="health.refresh.button"><%- this._getClientTranslation('health["refresh.button"]') %></span>
     </button>
   </h2>
 
@@ -29,9 +29,9 @@
     <table id="healthCheck" class="table table-striped" aria-describedby="health-page-heading">
       <thead>
         <tr>
-          <th scope="col" <%= jhiPrefix %>Translate="health.table.service">Service Name</th>
-          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.table.status">Status</th>
-          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.details.details">Details</th>
+          <th scope="col" <%= jhiPrefix %>Translate="health.table.service"><%- this._getClientTranslation('health.table.service') %></th>
+          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.table.status"><%- this._getClientTranslation('health.table.status') %></th>
+          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.details.details"><%- this._getClientTranslation('health.details.details') %></th>
         </tr>
       </thead>
       <tbody *ngIf="health">
@@ -49,7 +49,7 @@
               [ngClass]="getBadgeClass(componentHealth.value!.status)"
               <%= jhiPrefix %>Translate="{{ 'health.status.' + componentHealth.value!.status }}"
             >
-              {{ componentHealth.value!.status }}
+              {{ <%- JSON.stringify(this._getClientTranslation('health.status')) %>[componentHealth.value!.status || 'UNKNOWN'] }}
             </span>
           </td>
           <td class="text-center">

package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs

@@ -27,6 +27,5 @@ import { healthRoute } from './health.route';
 @NgModule({
   imports: [SharedModule, RouterModule.forChild([healthRoute])],
   declarations: [HealthComponent, HealthModalComponent],
-  entryComponents: [HealthModalComponent],
 })
 export class HealthModule {}

package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs

@@ -32,14 +32,14 @@
 
 <div class="modal-body pad">
   <div *ngIf="health">
-    <h5 <%= jhiPrefix %>Translate="health.details.properties">Properties</h5>
+    <h5 <%= jhiPrefix %>Translate="health.details.properties"><%- this._getClientTranslation('health.details.properties') %></h5>
 
     <div class="table-responsive">
       <table class="table table-striped" aria-describedby="showHealthLabel">
         <thead>
           <tr>
-            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.name">Name</th>
-            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.value">Value</th>
+            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.name"><%- this._getClientTranslation('health.details.name') %></th>
+            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.value"><%- this._getClientTranslation('health.details.value') %></th>
           </tr>
         </thead>
         <tbody>

package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs

@@ -17,18 +17,18 @@
  limitations under the License.
 -%>
 <div class="table-responsive" *ngIf="loggers">
-  <h2 id="logs-page-heading" <%= jhiPrefix %>Translate="logs.title" data-cy="logsPageHeading">Logs</h2>
+  <h2 id="logs-page-heading" <%= jhiPrefix %>Translate="logs.title" data-cy="logsPageHeading"><%- this._getClientTranslation('logs.title') %></h2>
 
-  <p <%= jhiPrefix %>Translate="logs.nbloggers" [translateValues]="{ total: loggers.length }">There are {{ loggers.length }} loggers.</p>
+  <p <%= jhiPrefix %>Translate="logs.nbloggers" [translateValues]="{ total: loggers.length }"><%- this._getClientTranslation('logs.nbloggers', { total: '{{ loggers.length }}' }) %></p>
 
-  <span <%= jhiPrefix %>Translate="logs.filter">Filter</span>
+  <span <%= jhiPrefix %>Translate="logs.filter"><%- this._getClientTranslation('logs.filter') %></span>
   <input type="text" [(ngModel)]="filter" (ngModelChange)="filterAndSort()" class="form-control" />
 
   <table class="table table-sm table-striped table-bordered" aria-describedby="logs-page-heading">
     <thead>
       <tr <%= jhiPrefix %>Sort [(predicate)]="orderProp" [(ascending)]="ascending" (sortChange)="filterAndSort()">
-        <th <%= jhiPrefix %>SortBy="name" scope="col"><span <%= jhiPrefix %>Translate="logs.table.name">Name</span> <fa-icon icon="sort"></fa-icon></th>
-        <th <%= jhiPrefix %>SortBy="level" scope="col"><span <%= jhiPrefix %>Translate="logs.table.level">Level</span> <fa-icon icon="sort"></fa-icon></th>
+        <th <%= jhiPrefix %>SortBy="name" scope="col"><span <%= jhiPrefix %>Translate="logs.table.name"><%- this._getClientTranslation('logs.table.name') %></span> <fa-icon icon="sort"></fa-icon></th>
+        <th <%= jhiPrefix %>SortBy="level" scope="col"><span <%= jhiPrefix %>Translate="logs.table.level"><%- this._getClientTranslation('logs.table.level') %></span> <fa-icon icon="sort"></fa-icon></th>
       </tr>
     </thead>
 

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h4 <%= jhiPrefix %>Translate="metrics.jvm.memory.title">Memory</h4>
+<h4 <%= jhiPrefix %>Translate="metrics.jvm.memory.title"><%- this._getClientTranslation('metrics.jvm.memory.title') %></h4>
 
 <div *ngIf="!updating && jvmMemoryMetrics">
   <div *ngFor="let entry of jvmMemoryMetrics | keyvalue">

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs

@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h4 <%= jhiPrefix %>Translate="metrics.jvm.threads.title">Threads</h4>
+<h4 <%= jhiPrefix %>Translate="metrics.jvm.threads.title"><%- this._getClientTranslation('metrics.jvm.threads.title') %></h4>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.runnable">Runnable</span> {{ threadStats.threadDumpRunnable }}</span>
+<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.runnable"><%- this._getClientTranslation('metrics.jvm.threads.runnable') %></span> {{ threadStats.threadDumpRunnable }}</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpRunnable"
@@ -30,7 +30,7 @@
   <span>{{ (threadStats.threadDumpRunnable * 100) / threadStats.threadDumpAll | number: '1.0-0' }}%</span>
 </ngb-progressbar>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.timedwaiting">Timed Waiting</span> ({{ threadStats.threadDumpTimedWaiting }})</span>
+<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.timedwaiting"><%- this._getClientTranslation('metrics.jvm.threads.timedwaiting') %></span> ({{ threadStats.threadDumpTimedWaiting }})</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpTimedWaiting"
@@ -42,7 +42,7 @@
   <span>{{ (threadStats.threadDumpTimedWaiting * 100) / threadStats.threadDumpAll | number: '1.0-0' }}%</span>
 </ngb-progressbar>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.waiting">Waiting</span> ({{ threadStats.threadDumpWaiting }})</span>
+<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.waiting"><%- this._getClientTranslation('metrics.jvm.threads.waiting') %></span> ({{ threadStats.threadDumpWaiting }})</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpWaiting"
@@ -54,7 +54,7 @@
   <span>{{ (threadStats.threadDumpWaiting * 100) / threadStats.threadDumpAll | number: '1.0-0' }}%</span>
 </ngb-progressbar>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.blocked">Blocked</span> ({{ threadStats.threadDumpBlocked }})</span>
+<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.blocked"><%- this._getClientTranslation('metrics.jvm.threads.blocked') %></span> ({{ threadStats.threadDumpBlocked }})</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpBlocked"

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs

@@ -16,21 +16,21 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="cacheMetrics" <%= jhiPrefix %>Translate="metrics.cache.title">Cache statistics</h3>
+<h3 id="cacheMetrics" <%= jhiPrefix %>Translate="metrics.cache.title"><%- this._getClientTranslation('metrics.cache.title') %></h3>
 
 <div class="table-responsive" *ngIf="!updating && cacheMetrics">
   <table class="table table-striped" aria-describedby="cacheMetrics">
     <thead>
       <tr>
-        <th scope="col" <%= jhiPrefix %>Translate="metrics.cache.cachename">Cache name</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hits">Cache Hits</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.misses">Cache Misses</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.gets">Cache Gets</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.puts">Cache Puts</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.removals">Cache Removals</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.evictions">Cache Evictions</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hitPercent">Cache Hit %</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.missPercent">Cache Miss %</th>
+        <th scope="col" <%= jhiPrefix %>Translate="metrics.cache.cachename"><%- this._getClientTranslation('metrics.cache.cachename') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hits"><%- this._getClientTranslation('metrics.cache.hits') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.misses"><%- this._getClientTranslation('metrics.cache.misses') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.gets"><%- this._getClientTranslation('metrics.cache.gets') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.puts"><%- this._getClientTranslation('metrics.cache.puts') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.removals"><%- this._getClientTranslation('metrics.cache.removals') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.evictions"><%- this._getClientTranslation('metrics.cache.evictions') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hitPercent"><%- this._getClientTranslation('metrics.cache.hitPercent') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.missPercent"><%- this._getClientTranslation('metrics.cache.missPercent') %></th>
       </tr>
     </thead>
     <tbody>

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs

@@ -16,24 +16,24 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="datasourceMetrics" <%= jhiPrefix %>Translate="metrics.datasource.title">DataSource statistics (time in millisecond)</h3>
+<h3 id="datasourceMetrics" <%= jhiPrefix %>Translate="metrics.datasource.title"><%- this._getClientTranslation('metrics.datasource.title') %></h3>
 
 <div class="table-responsive" *ngIf="!updating && datasourceMetrics">
   <table class="table table-striped" aria-describedby="datasourceMetrics">
     <thead>
       <tr>
         <th scope="col">
-          <span <%= jhiPrefix %>Translate="metrics.datasource.usage">Connection Pool Usage</span> (active: {{ datasourceMetrics.active.value }},
+          <span <%= jhiPrefix %>Translate="metrics.datasource.usage"><%- this._getClientTranslation('metrics.datasource.usage') %></span> (active: {{ datasourceMetrics.active.value }},
           min: {{ datasourceMetrics.min.value }}, max: {{ datasourceMetrics.max.value }}, idle: {{ datasourceMetrics.idle.value }})
         </th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.count">Count</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.mean">Mean</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min">Min</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50">p50</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75">p75</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95">p95</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99">p99</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.max">Max</th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.count"><%- this._getClientTranslation('metrics.datasource.count') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.mean"><%- this._getClientTranslation('metrics.datasource.mean') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min"><%- this._getClientTranslation('metrics.servicesstats.table.min') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50"><%- this._getClientTranslation('metrics.servicesstats.table.p50') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75"><%- this._getClientTranslation('metrics.servicesstats.table.p75') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95"><%- this._getClientTranslation('metrics.servicesstats.table.p95') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99"><%- this._getClientTranslation('metrics.servicesstats.table.p99') %></th>
+        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.datasource.max"><%- this._getClientTranslation('metrics.datasource.max') %></th>
       </tr>
     </thead>
     <tbody>

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="garbageCollectorMetrics" <%= jhiPrefix %>Translate="metrics.jvm.gc.title">Garbage collector statistics</h3>
+<h3 id="garbageCollectorMetrics" <%= jhiPrefix %>Translate="metrics.jvm.gc.title"><%- this._getClientTranslation('metrics.jvm.gc.title') %></h3>
 
 <div class="row">
   <div class="col-md-4">
@@ -82,14 +82,14 @@
       <thead>
         <tr>
           <th scope="col"></th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.count">Count</th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.mean">Mean</th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min">Min</th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50">p50</th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75">p75</th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95">p95</th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99">p99</th>
-          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.max">Max</th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.count"><%- this._getClientTranslation('metrics.servicesstats.table.count') %></th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.mean"><%- this._getClientTranslation('metrics.servicesstats.table.mean') %></th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.min"><%- this._getClientTranslation('metrics.servicesstats.table.min') %></th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p50"><%- this._getClientTranslation('metrics.servicesstats.table.p50') %></th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p75"><%- this._getClientTranslation('metrics.servicesstats.table.p75') %></th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p95"><%- this._getClientTranslation('metrics.servicesstats.table.p95') %></th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.p99"><%- this._getClientTranslation('metrics.servicesstats.table.p99') %></th>
+          <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.servicesstats.table.max"><%- this._getClientTranslation('metrics.servicesstats.table.max') %></th>
         </tr>
       </thead>
       <tbody>