generator-jhipster 8.0.0-beta.3 → 8.0.0

package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs

@@ -19,27 +19,17 @@
 <div>
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
-      <h1 <%= jhiPrefix %>Translate="register.title" data-cy="registerTitle"><%- getWebappTranslation('register.title') %></h1>
+      <h1 <%= jhiPrefix %>Translate="register.title" data-cy="registerTitle">__jhiTransformTranslate__('register.title')</h1>
 
-      <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="register.messages.success">
-        <%- getWebappTranslation('register.messages.success') %>
-      </div>
+      <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="register.messages.success">__jhiTransformTranslate__('register.messages.success')</div>
 
-      <div class="alert alert-danger" *ngIf="error" <%= jhiPrefix %>Translate="register.messages.error.fail">
-        <%- getWebappTranslation('register.messages.error.fail') %>
-      </div>
+      <div class="alert alert-danger" *ngIf="error" <%= jhiPrefix %>Translate="register.messages.error.fail">__jhiTransformTranslate__('register.messages.error.fail')</div>
 
-      <div class="alert alert-danger" *ngIf="errorUserExists" <%= jhiPrefix %>Translate="register.messages.error.userexists">
-        <%- getWebappTranslation('register.messages.error.userexists') %>
-      </div>
+      <div class="alert alert-danger" *ngIf="errorUserExists" <%= jhiPrefix %>Translate="register.messages.error.userexists">__jhiTransformTranslate__('register.messages.error.userexists')</div>
 
-      <div class="alert alert-danger" *ngIf="errorEmailExists" <%= jhiPrefix %>Translate="register.messages.error.emailexists">
-        <%- getWebappTranslation('register.messages.error.emailexists') %>
-      </div>
+      <div class="alert alert-danger" *ngIf="errorEmailExists" <%= jhiPrefix %>Translate="register.messages.error.emailexists">__jhiTransformTranslate__('register.messages.error.emailexists')</div>
 
-      <div class="alert alert-danger" *ngIf="doNotMatch" <%= jhiPrefix %>Translate="global.messages.error.dontmatch">
-        <%- getWebappTranslation('global.messages.error.dontmatch') %>
-      </div>
+      <div class="alert alert-danger" *ngIf="doNotMatch" <%= jhiPrefix %>Translate="global.messages.error.dontmatch">__jhiTransformTranslate__('global.messages.error.dontmatch')</div>
     </div>
   </div>
 
@@ -47,7 +37,7 @@
     <div class="col-md-8">
       <form name="form" role="form" (ngSubmit)="register()" [formGroup]="registerForm" *ngIf="!success">
         <div class="mb-3">
-          <label class="form-label" for="login" <%= jhiPrefix %>Translate="global.form.username.label"><%- getWebappTranslation('global.form["username.label"]') %></label>
+          <label class="form-label" for="login" <%= jhiPrefix %>Translate="global.form.username.label">__jhiTransformTranslate__('global.form["username.label"]')</label>
           <input
             type="text"
             class="form-control"
@@ -64,38 +54,30 @@
               class="form-text text-danger"
               *ngIf="registerForm.get('login')?.errors?.required"
               <%= jhiPrefix %>Translate="register.messages.validate.login.required"
-            >
-               <%- getWebappTranslation('register.messages.validate.login.required') %>
-            </small>
+            >__jhiTransformTranslate__('register.messages.validate.login.required')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('login')?.errors?.minlength"
               <%= jhiPrefix %>Translate="register.messages.validate.login.minlength"
-            >
-              <%- getWebappTranslation('register.messages.validate.login.minlength') %>
-            </small>
+            >__jhiTransformTranslate__('register.messages.validate.login.minlength')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('login')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="register.messages.validate.login.maxlength"
-            >
-              <%- getWebappTranslation('register.messages.validate.login.maxlength') %>
-            </small>
+            >__jhiTransformTranslate__('register.messages.validate.login.maxlength')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('login')?.errors?.pattern"
               <%= jhiPrefix %>Translate="register.messages.validate.login.pattern"
-            >
-              <%- getWebappTranslation('register.messages.validate.login.pattern') %>
-            </small>
+            >__jhiTransformTranslate__('register.messages.validate.login.pattern')</small>
           </div>
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label"><%- getWebappTranslation('global.form["email.label"]') %></label>
+          <label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label">__jhiTransformTranslate__('global.form["email.label"]')</label>
           <input
             type="email"
             class="form-control"
@@ -111,38 +93,30 @@
               class="form-text text-danger"
               *ngIf="registerForm.get('email')?.errors?.required"
               <%= jhiPrefix %>Translate="global.messages.validate.email.required"
-            >
-              <%- getWebappTranslation('global.messages.validate.email.required') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.email.required')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('email')?.errors?.invalid"
               <%= jhiPrefix %>Translate="global.messages.validate.email.invalid"
-            >
-               <%- getWebappTranslation('global.messages.validate.email.invalid') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.email.invalid')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('email')?.errors?.minlength"
               <%= jhiPrefix %>Translate="global.messages.validate.email.minlength"
-            >
-              <%- getWebappTranslation('global.messages.validate.email.minlength') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.email.minlength')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('email')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="global.messages.validate.email.maxlength"
-            >
-              <%- getWebappTranslation('global.messages.validate.email.maxlength') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.email.maxlength')</small>
           </div>
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="password" <%= jhiPrefix %>Translate="global.form.newpassword.label"><%- getWebappTranslation('global.form["newpassword.label"]') %></label>
+          <label class="form-label" for="password" <%= jhiPrefix %>Translate="global.form.newpassword.label">__jhiTransformTranslate__('global.form["newpassword.label"]')</label>
           <input
             type="password"
             class="form-control"
@@ -163,32 +137,26 @@
               class="form-text text-danger"
               *ngIf="registerForm.get('password')?.errors?.required"
               <%= jhiPrefix %>Translate="global.messages.validate.newpassword.required"
-            >
-              <%- getWebappTranslation('global.messages.validate.newpassword.required') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.newpassword.required')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('password')?.errors?.minlength"
               <%= jhiPrefix %>Translate="global.messages.validate.newpassword.minlength"
-            >
-              <%- getWebappTranslation('global.messages.validate.newpassword.minlength') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.newpassword.minlength')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('password')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="global.messages.validate.newpassword.maxlength"
-            >
-               <%- getWebappTranslation('global.messages.validate.newpassword.maxlength') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.newpassword.maxlength')</small>
           </div>
 
           <<%= jhiPrefixDashed %>-password-strength-bar [passwordToCheck]="registerForm.get('password')!.value"></<%= jhiPrefixDashed %>-password-strength-bar>
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="confirmPassword" <%= jhiPrefix %>Translate="global.form.confirmpassword.label"><%- getWebappTranslation('global.form["confirmpassword.label"]') %></label>
+          <label class="form-label" for="confirmPassword" <%= jhiPrefix %>Translate="global.form.confirmpassword.label">__jhiTransformTranslate__('global.form["confirmpassword.label"]')</label>
           <input
             type="password"
             class="form-control"
@@ -209,25 +177,19 @@
               class="form-text text-danger"
               *ngIf="registerForm.get('confirmPassword')?.errors?.required"
               <%= jhiPrefix %>Translate="global.messages.validate.confirmpassword.required"
-            >
-              <%- getWebappTranslation('global.messages.validate.confirmpassword.required') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.confirmpassword.required')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('confirmPassword')?.errors?.minlength"
               <%= jhiPrefix %>Translate="global.messages.validate.confirmpassword.minlength"
-            >
-              <%- getWebappTranslation('global.messages.validate.confirmpassword.minlength') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.confirmpassword.minlength')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="registerForm.get('confirmPassword')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="global.messages.validate.confirmpassword.maxlength"
-            >
-              <%- getWebappTranslation('global.messages.validate.confirmpassword.maxlength') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.confirmpassword.maxlength')</small>
           </div>
         </div>
 
@@ -237,14 +199,12 @@
           class="btn btn-primary"
           <%= jhiPrefix %>Translate="register.form.button"
           data-cy="submit"
-        >
-          <%- getWebappTranslation('register.form.button') %>
-        </button>
+        >__jhiTransformTranslate__('register.form.button')</button>
       </form>
 
       <div class="mt-3 alert alert-warning">
-        <span <%= jhiPrefix %>Translate="global.messages.info.authenticated.prefix"><%- getWebappTranslation('global.messages.info.authenticated.prefix') %> </span>
-        <a class="alert-link" routerLink="/login" <%= jhiPrefix %>Translate="global.messages.info.authenticated.link"><%- getWebappTranslation('global.messages.info.authenticated.link') %></a><span <%= jhiPrefix %>Translate="global.messages.info.authenticated.suffix"><%- getWebappTranslation('global.messages.info.authenticated.suffix') %></span>
+        <span <%= jhiPrefix %>Translate="global.messages.info.authenticated.prefix">__jhiTransformTranslate__('global.messages.info.authenticated.prefix')</span>
+        <a class="alert-link" routerLink="/login" <%= jhiPrefix %>Translate="global.messages.info.authenticated.link">__jhiTransformTranslate__('global.messages.info.authenticated.link')</a><span <%= jhiPrefix %>Translate="global.messages.info.authenticated.suffix">__jhiTransformTranslate__('global.messages.info.authenticated.suffix')</span>
       </div>
     </div>
   </div>

package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs

@@ -17,23 +17,19 @@
  limitations under the License.
 -%>
 <div>
-  <h2 id="session-page-heading" <%= jhiPrefix %>Translate="sessions.title" [translateValues]="{ username: account.login }" *ngIf="account"><%- getWebappTranslation('sessions.title', { username: '{{ account.login }}' }) %></h2>
+  <h2 id="session-page-heading" <%= jhiPrefix %>Translate="sessions.title" [translateValues]="{ username: account.login }" *ngIf="account">__jhiTransformTranslate__('sessions.title', { "username": "{{ account.login }}" })</h2>
 
-  <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="sessions.messages.success">
-    <%- getWebappTranslation('sessions.messages.success') %>
-  </div>
+  <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="sessions.messages.success">__jhiTransformTranslate__('sessions.messages.success')</div>
 
-  <div class="alert alert-danger" *ngIf="error" <%= jhiPrefix %>Translate="sessions.messages.error">
-     <%- getWebappTranslation('sessions.messages.error') %>
-  </div>
+  <div class="alert alert-danger" *ngIf="error" <%= jhiPrefix %>Translate="sessions.messages.error">__jhiTransformTranslate__('sessions.messages.error')</div>
 
   <div class="table-responsive">
     <table class="table table-striped" aria-describedby="session-page-heading">
       <thead>
         <tr>
-          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.ipaddress"><%- getWebappTranslation('sessions.table.ipaddress') %></th>
-          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.useragent"><%- getWebappTranslation('sessions.table.useragent') %></th>
-          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.date"><%- getWebappTranslation('sessions.table.date') %></th>
+          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.ipaddress">__jhiTransformTranslate__('sessions.table.ipaddress')</th>
+          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.useragent">__jhiTransformTranslate__('sessions.table.useragent')</th>
+          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.date">__jhiTransformTranslate__('sessions.table.date')</th>
           <th scope="col"></th>
         </tr>
       </thead>
@@ -48,9 +44,7 @@
               class="btn btn-primary"
               (click)="invalidate(session.series)"
               <%= jhiPrefix %>Translate="sessions.table.button"
-            >
-              <%- getWebappTranslation('sessions.table.button') %>
-            </button>
+            >__jhiTransformTranslate__('sessions.table.button')</button>
           </td>
         </tr>
       </tbody>

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

@@ -19,19 +19,15 @@
 <div>
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
-      <h2 <%= jhiPrefix %>Translate="settings.title" [translateValues]="{ username: settingsForm.value.login }" *ngIf="settingsForm.value.login">
-        <%- getWebappTranslation('settings.title', { username: '{{ settingsForm.value.login }}' }) %>
-      </h2>
+      <h2 <%= jhiPrefix %>Translate="settings.title" [translateValues]="{ username: settingsForm.value.login }" *ngIf="settingsForm.value.login">__jhiTransformTranslate__('settings.title', { "username": "{{ settingsForm.value.login }}" })</h2>
 
-      <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="settings.messages.success">
-          <%- getWebappTranslation('settings.messages.success') %>
-      </div>
+      <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="settings.messages.success">__jhiTransformTranslate__('settings.messages.success')</div>
 
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 
       <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"><%- getWebappTranslation('settings.form.firstname') %></label>
+          <label class="form-label" for="firstName" <%= jhiPrefix %>Translate="settings.form.firstname">__jhiTransformTranslate__('settings.form.firstname')</label>
           <input
             type="text"
             class="form-control"
@@ -52,30 +48,24 @@
               class="form-text text-danger"
               *ngIf="settingsForm.get('firstName')?.errors?.required"
               <%= jhiPrefix %>Translate="settings.messages.validate.firstname.required"
-            >
-              <%- getWebappTranslation('settings.messages.validate.firstname.required') %>
-            </small>
+            >__jhiTransformTranslate__('settings.messages.validate.firstname.required')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="settingsForm.get('firstName')?.errors?.minlength"
               <%= jhiPrefix %>Translate="settings.messages.validate.firstname.minlength"
-            >
-              <%- getWebappTranslation('settings.messages.validate.firstname.minlength') %>
-            </small>
+            >__jhiTransformTranslate__('settings.messages.validate.firstname.minlength')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="settingsForm.get('firstName')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="settings.messages.validate.firstname.maxlength"
-            >
-              <%- getWebappTranslation('settings.messages.validate.firstname.maxlength') %>
-            </small>
+            >__jhiTransformTranslate__('settings.messages.validate.firstname.maxlength')</small>
           </div>
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="lastName" <%= jhiPrefix %>Translate="settings.form.lastname"><%- getWebappTranslation('settings.form.lastname') %></label>
+          <label class="form-label" for="lastName" <%= jhiPrefix %>Translate="settings.form.lastname">__jhiTransformTranslate__('settings.form.lastname')</label>
           <input
             type="text"
             class="form-control"
@@ -96,30 +86,24 @@
               class="form-text text-danger"
               *ngIf="settingsForm.get('lastName')?.errors?.required"
               <%= jhiPrefix %>Translate="settings.messages.validate.lastname.required"
-            >
-              <%- getWebappTranslation('settings.messages.validate.lastname.required') %>
-            </small>
+            >__jhiTransformTranslate__('settings.messages.validate.lastname.required')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="settingsForm.get('lastName')?.errors?.minlength"
               <%= jhiPrefix %>Translate="settings.messages.validate.lastname.minlength"
-            >
-              <%- getWebappTranslation('settings.messages.validate.lastname.minlength') %>
-            </small>
+            >__jhiTransformTranslate__('settings.messages.validate.lastname.minlength')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="settingsForm.get('lastName')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="settings.messages.validate.lastname.maxlength"
-            >
-               <%- getWebappTranslation('settings.messages.validate.lastname.maxlength') %>
-            </small>
+            >__jhiTransformTranslate__('settings.messages.validate.lastname.maxlength')</small>
           </div>
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label"><%- getWebappTranslation('global.form["email.label"]') %></label>
+          <label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label">__jhiTransformTranslate__('global.form["email.label"]')</label>
           <input
             type="email"
             class="form-control"
@@ -135,39 +119,31 @@
               class="form-text text-danger"
               *ngIf="settingsForm.get('email')?.errors?.required"
               <%= jhiPrefix %>Translate="global.messages.validate.email.required"
-            >
-              <%- getWebappTranslation('global.messages.validate.email.required') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.email.required')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="settingsForm.get('email')?.errors?.email"
               <%= jhiPrefix %>Translate="global.messages.validate.email.invalid"
-            >
-              <%- getWebappTranslation('global.messages.validate.email.invalid') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.email.invalid')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="settingsForm.get('email')?.errors?.minlength"
               <%= jhiPrefix %>Translate="global.messages.validate.email.minlength"
-            >
-              <%- getWebappTranslation('global.messages.validate.email.minlength') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.email.minlength')</small>
 
             <small
               class="form-text text-danger"
               *ngIf="settingsForm.get('email')?.errors?.maxlength"
               <%= jhiPrefix %>Translate="global.messages.validate.email.maxlength"
-            >
-              <%- getWebappTranslation('global.messages.validate.email.maxlength') %>
-            </small>
+            >__jhiTransformTranslate__('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"><%- getWebappTranslation('settings.form.language') %></label>
+          <label for="langKey" <%= jhiPrefix %>Translate="settings.form.language">__jhiTransformTranslate__('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>
@@ -180,9 +156,7 @@
           class="btn btn-primary"
           <%= jhiPrefix %>Translate="settings.form.button"
           data-cy="submit"
-        >
-          <%- getWebappTranslation('settings.form.button') %>
-        </button>
+        >__jhiTransformTranslate__('settings.form.button')</button>
       </form>
     </div>
   </div>

package/dist/generators/angular/templates/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"><%- getWebappTranslation('configuration.title') %></h2>
+  <h2 id="configuration-page-heading" <%= jhiPrefix %>Translate="configuration.title" data-cy="configurationPageHeading">__jhiTransformTranslate__('configuration.title')</h2>
 
-  <span <%= jhiPrefix %>Translate="configuration.filter"><%- getWebappTranslation('configuration.filter') %></span>
+  <span <%= jhiPrefix %>Translate="configuration.filter">__jhiTransformTranslate__('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"><%- getWebappTranslation('configuration.table.prefix') %></span> <fa-icon icon="sort"></fa-icon>
+          <span <%= jhiPrefix %>Translate="configuration.table.prefix">__jhiTransformTranslate__('configuration.table.prefix')</span> <fa-icon icon="sort"></fa-icon>
         </th>
-        <th scope="col" class="w-60"><span <%= jhiPrefix %>Translate="configuration.table.properties"><%- getWebappTranslation('configuration.table.properties') %></span></th>
+        <th scope="col" class="w-60"><span <%= jhiPrefix %>Translate="configuration.table.properties">__jhiTransformTranslate__('configuration.table.properties')</span></th>
       </tr>
     </thead>
     <tbody>

package/dist/generators/angular/templates/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"><%- getWebappTranslation('gateway.title') %></span>
+    <span id="gateway-page-heading" <%= jhiPrefix %>Translate="gateway.title">__jhiTransformTranslate__('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"><%- getWebappTranslation('gateway.refresh.button') %></span>
+      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="gateway.refresh.button">__jhiTransformTranslate__('gateway.refresh.button')</span>
     </button>
   </h2>
 
-  <h3 <%= jhiPrefix %>Translate="gateway.routes.title"><%- getWebappTranslation('gateway.routes.title') %></h3>
+  <h3 <%= jhiPrefix %>Translate="gateway.routes.title">__jhiTransformTranslate__('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"><%- getWebappTranslation('gateway.routes.url') %></th>
-          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.service"><%- getWebappTranslation('gateway.routes.service') %></th>
-          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.servers"><%- getWebappTranslation('gateway.routes.servers') %></th>
+          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.url">__jhiTransformTranslate__('gateway.routes.url')</th>
+          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.service">__jhiTransformTranslate__('gateway.routes.service')</th>
+          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.servers">__jhiTransformTranslate__('gateway.routes.servers')</th>
         </tr>
       </thead>
       <tbody>
@@ -41,9 +41,7 @@
           <td>{{ route.path }}</td>
           <td>{{ route.serviceId }}</td>
           <td>
-            <div *ngIf="route.serviceInstances.length === 0" class="label label-danger" <%= jhiPrefix %>Translate="gateway.routes.error">
-              <%- getWebappTranslation('gateway.routes.error') %>
-            </div>
+            <div *ngIf="route.serviceInstances.length === 0" class="label label-danger" <%= jhiPrefix %>Translate="gateway.routes.error">__jhiTransformTranslate__('gateway.routes.error')</div>
 
             <div class="table-responsive">
               <table class="table table-striped" *ngIf="route">

package/dist/generators/angular/templates/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"><%- getWebappTranslation('health.title') %></span>
+    <span id="health-page-heading" <%= jhiPrefix %>Translate="health.title" data-cy="healthPageHeading">__jhiTransformTranslate__('health.title')</span>
 
     <button class="btn btn-primary float-end" (click)="refresh()">
-      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="health.refresh.button"><%- getWebappTranslation('health["refresh.button"]') %></span>
+      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="health.refresh.button">__jhiTransformTranslate__('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"><%- getWebappTranslation('health.table.service') %></th>
-          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.table.status"><%- getWebappTranslation('health.table.status') %></th>
-          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.details.details"><%- getWebappTranslation('health.details.details') %></th>
+          <th scope="col" <%= jhiPrefix %>Translate="health.table.service">__jhiTransformTranslate__('health.table.service')</th>
+          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.table.status">__jhiTransformTranslate__('health.table.status')</th>
+          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.details.details">__jhiTransformTranslate__('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 }}"
             >
-              {{ <%- JSON.stringify(getWebappTranslation('health.status')) %>[componentHealth.value!.status || 'UNKNOWN'] }}
+              {{ __jhiTransformTranslateStringify__('health.status')[componentHealth.value!.status || 'UNKNOWN'] }}
             </span>
           </td>
           <td class="text-center">

package/dist/generators/angular/templates/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"><%- getWebappTranslation('health.details.properties') %></h5>
+    <h5 <%= jhiPrefix %>Translate="health.details.properties">__jhiTransformTranslate__('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"><%- getWebappTranslation('health.details.name') %></th>
-            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.value"><%- getWebappTranslation('health.details.value') %></th>
+            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.name">__jhiTransformTranslate__('health.details.name')</th>
+            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.value">__jhiTransformTranslate__('health.details.value')</th>
           </tr>
         </thead>
         <tbody>

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <div class="table-responsive" *ngIf="loggers">
-  <h2 id="logs-page-heading" <%= jhiPrefix %>Translate="logs.title" data-cy="logsPageHeading"><%- getWebappTranslation('logs.title') %></h2>
+  <h2 id="logs-page-heading" <%= jhiPrefix %>Translate="logs.title" data-cy="logsPageHeading">__jhiTransformTranslate__('logs.title')</h2>
 
 <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
   <div class="float-end">
@@ -34,16 +34,16 @@
     <div class="spinner-border"></div>
   </div>
 
-  <p <%= jhiPrefix %>Translate="logs.nbloggers" [translateValues]="{ total: loggers.length }"><%- getWebappTranslation('logs.nbloggers', { total: '{{ loggers.length }}' }) %></p>
+  <p <%= jhiPrefix %>Translate="logs.nbloggers" [translateValues]="{ total: loggers.length }">__jhiTransformTranslate__('logs.nbloggers', { "total": "{{ loggers.length }}" })</p>
 
-  <span <%= jhiPrefix %>Translate="logs.filter"><%- getWebappTranslation('logs.filter') %></span>
+  <span <%= jhiPrefix %>Translate="logs.filter">__jhiTransformTranslate__('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"><%- getWebappTranslation('logs.table.name') %></span> <fa-icon icon="sort"></fa-icon></th>
-        <th <%= jhiPrefix %>SortBy="level" scope="col"><span <%= jhiPrefix %>Translate="logs.table.level"><%- getWebappTranslation('logs.table.level') %></span> <fa-icon icon="sort"></fa-icon></th>
+        <th <%= jhiPrefix %>SortBy="name" scope="col"><span <%= jhiPrefix %>Translate="logs.table.name">__jhiTransformTranslate__('logs.table.name')</span> <fa-icon icon="sort"></fa-icon></th>
+        <th <%= jhiPrefix %>SortBy="level" scope="col"><span <%= jhiPrefix %>Translate="logs.table.level">__jhiTransformTranslate__('logs.table.level')</span> <fa-icon icon="sort"></fa-icon></th>
       </tr>
     </thead>
 

package/dist/generators/angular/templates/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"><%- getWebappTranslation('metrics.jvm.memory.title') %></h4>
+<h4 <%= jhiPrefix %>Translate="metrics.jvm.memory.title">__jhiTransformTranslate__('metrics.jvm.memory.title')</h4>
 
 <div *ngIf="!updating && jvmMemoryMetrics">
   <div *ngFor="let entry of jvmMemoryMetrics | keyvalue">

package/dist/generators/angular/templates/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"><%- getWebappTranslation('metrics.jvm.threads.title') %></h4>
+<h4 <%= jhiPrefix %>Translate="metrics.jvm.threads.title">__jhiTransformTranslate__('metrics.jvm.threads.title')</h4>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.runnable"><%- getWebappTranslation('metrics.jvm.threads.runnable') %></span> {{ threadStats.threadDumpRunnable }}</span>
+<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.runnable">__jhiTransformTranslate__('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"><%- getWebappTranslation('metrics.jvm.threads.timedwaiting') %></span> ({{ threadStats.threadDumpTimedWaiting }})</span>
+<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.timedwaiting">__jhiTransformTranslate__('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"><%- getWebappTranslation('metrics.jvm.threads.waiting') %></span> ({{ threadStats.threadDumpWaiting }})</span>
+<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.waiting">__jhiTransformTranslate__('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"><%- getWebappTranslation('metrics.jvm.threads.blocked') %></span> ({{ threadStats.threadDumpBlocked }})</span>
+<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.blocked">__jhiTransformTranslate__('metrics.jvm.threads.blocked')</span> ({{ threadStats.threadDumpBlocked }})</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpBlocked"