generator-jhipster 8.0.0-beta.3 → 8.0.0-rc.1

package/dist/generators/angular/support/update-languages.mjs

@@ -21,16 +21,17 @@ function updateLanguagesInConstantsTask({ application, control = {} }) {
     this.editFile(`${clientSrcDir}app/config/language.constants.ts`, { ignoreNonExisting }, content => content.replace(/export.*LANGUAGES.*\[([^\]]*jhipster-needle-i18n-language-constant[^\]]*)\];/g, newContent));
 }
 function updateLanguagesInWebpackTask({ application, control = {} }) {
-    const { clientSrcDir, languages } = application;
+    const { clientSrcDir, clientRootDir, languages } = application;
     const { ignoreNeedlesError: ignoreNonExisting } = control;
     let newContent = 'groupBy: [\n';
+    const srcRelativePath = this.relativeDir(clientRootDir, clientSrcDir);
     languages?.forEach(language => {
-        newContent += `                    { pattern: "./${clientSrcDir}i18n/${language}/*.json", fileName: "./i18n/${language}.json" },\n`;
+        newContent += `                    { pattern: "./${srcRelativePath}i18n/${language}/*.json", fileName: "./i18n/${language}.json" },\n`;
     });
     newContent +=
         '                    // jhipster-needle-i18n-language-webpack - JHipster will add/remove languages in this array\n' +
             '                ]';
-    this.editFile('webpack/webpack.custom.js', { ignoreNonExisting }, content => content.replace(/groupBy:.*\[([^\]]*jhipster-needle-i18n-language-webpack[^\]]*)\]/g, newContent));
+    this.editFile(`${clientRootDir}webpack/webpack.custom.js`, { ignoreNonExisting }, content => content.replace(/groupBy:.*\[([^\]]*jhipster-needle-i18n-language-webpack[^\]]*)\]/g, newContent));
 }
 export default function updateLanguagesTask(param) {
     updateLanguagesInPipeTask.call(this, param);

package/dist/generators/angular/templates/.eslintrc.json.ejs

@@ -38,7 +38,7 @@
     "project": [
       "./tsconfig.app.json",
 <%_ if (cypressTests) { _%>
-      "./<%= clientTestDir %>cypress/tsconfig.json",
+      "./<%= this.relativeDir(clientRootDir, cypressDir) %>tsconfig.json",
 <%_ } _%>
       "./tsconfig.spec.json"
     ]

package/dist/generators/angular/templates/angular.json.ejs

@@ -32,7 +32,7 @@
         }
       },
       "root": "",
-      "sourceRoot": "<%= clientSrcDir.replace(/\/$/, "") %>",
+      "sourceRoot": "<%= this.relativeDir(clientRootDir, clientSrcDir).replace(/\/$/, "") %>",
       "prefix": "<%= jhiPrefixDashed %>",
       "architect": {
         "build": {
@@ -41,12 +41,12 @@
             "customWebpackConfig": {
               "path": "./webpack/webpack.custom.js"
             },
-            "outputPath": "<%= clientDistDir %>",
-            "index": "<%= clientSrcDir %>index.html",
-            "main": "<%= clientSrcDir %>main.ts",
+            "outputPath": "<%= this.relativeDir(clientRootDir, clientDistDir) %>",
+            "index": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>index.html",
+            "main": "<%= this.relativeDir(clientRootDir, clientSrcDir) %>main.ts",
             "polyfills": [
 <%_ if (communicationSpringWebsocket) { _%>
-              "./<%= clientSrcDir %>sockjs-client.polyfill",
+              "./<%= this.relativeDir(clientRootDir, clientSrcDir) %>sockjs-client.polyfill",
 <%_ } _%>
 <%_ if (microfrontend) { _%>
               "zone.js/dist/zone"
@@ -57,12 +57,15 @@
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              "<%= clientSrcDir %>content",
-              "<%= clientSrcDir %>favicon.ico",
-              "<%= clientSrcDir %>manifest.webapp",
-              "<%= clientSrcDir %>robots.txt"
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content",
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>favicon.ico",
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>manifest.webapp",
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>robots.txt"
+            ],
+            "styles": [
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/vendor.scss",
+              "<%= this.relativeDir(clientRootDir, clientSrcDir) %>content/scss/global.scss"
             ],
-            "styles": ["<%= clientSrcDir %>content/scss/vendor.scss", "<%= clientSrcDir %>content/scss/global.scss"],
             "scripts": []
           },
           "configurations": {
@@ -119,7 +122,8 @@
         "test": {
           "builder": "@angular-builders/jest:run",
           "options": {
-            "configPath": "jest.conf.js"
+            "configPath": "jest.conf.js",
+            "tsConfig": "tsconfig.spec.json"
           }
         }
       }
@@ -128,7 +132,7 @@
   "cli": {
     "cache": {
       "enabled": true,
-      "path": "./<%= temporaryDir %>angular/",
+      "path": "./<%= this.relativeDir(clientRootDir, temporaryDir) %>angular/",
       "environment": "all"
     },
     "packageManager": "<%= clientPackageManager %>"

package/dist/generators/angular/templates/jest.conf.js.ejs

@@ -30,15 +30,15 @@ module.exports = {
   roots: ['<rootDir>', `<rootDir>/${baseUrl}`],
   modulePaths: [`<rootDir>/${baseUrl}`],
   setupFiles: ['jest-date-mock'],
-  cacheDirectory: '<rootDir>/<%= temporaryDir %>jest-cache',
-  coverageDirectory: '<rootDir>/<%= temporaryDir %>test-results/',
+  cacheDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>jest-cache',
+  coverageDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/',
   moduleNameMapper: pathsToModuleNameMapper(paths, { prefix: `<rootDir>/${baseUrl}/` }),
   reporters: [
     'default',
-    ['jest-junit', { outputDirectory: '<rootDir>/<%= temporaryDir %>test-results/', outputName: 'TESTS-results-jest.xml' }],
-    ['jest-sonar', { outputDirectory: './<%= temporaryDir %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
+    ['jest-junit', { outputDirectory: '<rootDir>/<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/', outputName: 'TESTS-results-jest.xml' }],
+    ['jest-sonar', { outputDirectory: './<%= this.relativeDir(clientRootDir, temporaryDir) %>test-results/jest', outputName: 'TESTS-results-sonar.xml' }],
   ],
-  testMatch: ['<rootDir>/<%= clientSrcDir %>app/**/@(*.)@(spec.ts)'],
+  testMatch: ['<rootDir>/<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/**/@(*.)@(spec.ts)'],
   testEnvironmentOptions: {
     url: 'https://jhipster.tech',
   },

package/dist/generators/angular/templates/package.json.ejs

@@ -99,12 +99,6 @@
     "eslint": "<%= nodeDependencies['eslint'] %>",
     "eslint-config-prettier": "<%= nodeDependencies['eslint-config-prettier'] %>",
     "eslint-webpack-plugin": "<%= nodeDependencies['eslint-webpack-plugin'] %>",
-<%_ if (!skipJhipsterDependencies) { _%>
-    "generator-jhipster": "<%= jhipsterVersion %>",
-  <%_ blueprints.forEach(blueprint => { _%>
-    "<%= blueprint.name %>": "<%= blueprint.version %>",
-  <%_ }); _%>
-<%_ } _%>
     "jest": "<%= nodeDependencies['jest'] %>",
     "jest-environment-jsdom": "<%= nodeDependencies['jest'] %>",
     "jest-preset-angular": "<%= nodeDependencies['jest-preset-angular'] %>",
@@ -138,8 +132,8 @@
     "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
     "lint": "eslint . --ext .js,.ts",
     "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
-    "cleanup": "rimraf <%= clientDistDir %>",
-    "clean-www": "rimraf <%= clientDistDir %>app/{src,<%= temporaryDir %>}",
+    "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
+    "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",
     "jest": "jest --coverage --logHeapUsage --maxWorkers=2 --config jest.conf.js",
     "start": "ng serve<% if (!microfrontend) { %> --hmr<% } %>",
     "start-tls": "<%= clientPackageManager %> run webapp:dev-ssl",

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

@@ -19,16 +19,14 @@
 <div>
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
-      <h1 <%= jhiPrefix %>Translate="activate.title"><%- getWebappTranslation('activate.title') %></h1>
+      <h1 <%= jhiPrefix %>Translate="activate.title">__jhiTransformTranslate__('activate.title')</h1>
 
       <div class="alert alert-success" *ngIf="success">
-        <span <%= jhiPrefix %>Translate="activate.messages.success"><%- getWebappTranslation('activate.messages.success') %></span>
-        <a class="alert-link" routerLink="/login" <%= jhiPrefix %>Translate="global.messages.info.authenticated.link"><%- getWebappTranslation('global.messages.info.authenticated.link') %></a>.
+        <span <%= jhiPrefix %>Translate="activate.messages.success">__jhiTransformTranslate__('activate.messages.success')</span>
+        <a class="alert-link" routerLink="/login" <%= jhiPrefix %>Translate="global.messages.info.authenticated.link">__jhiTransformTranslate__('global.messages.info.authenticated.link')</a>.
       </div>
 
-      <div class="alert alert-danger" *ngIf="error" <%= jhiPrefix %>Translate="activate.messages.error">
-        <%- getWebappTranslation('activate.messages.error') %>
-      </div>
+      <div class="alert alert-danger" *ngIf="error" <%= jhiPrefix %>Translate="activate.messages.error">__jhiTransformTranslate__('activate.messages.error')</div>
     </div>
   </div>
 </div>

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <div id="strength">
-  <small<% if (enableTranslation) { %> <%= jhiPrefix %>Translate="global.messages.validate.newpassword.strength"<% } %>><%- getWebappTranslation('global.messages.validate.newpassword.strength') %></small>
+  <small<% if (enableTranslation) { %> <%= jhiPrefix %>Translate="global.messages.validate.newpassword.strength"<% } %>>__jhiTransformTranslate__('global.messages.validate.newpassword.strength')</small>
   <ul id="strengthBar">
     <li class="point"></li>
     <li class="point"></li>

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

@@ -19,25 +19,17 @@
 <div>
   <div class="d-flex justify-content-center">
     <div class="col-md-8" *ngIf="account$ | async as account">
-      <h2 <%= jhiPrefix %>Translate="password.title" [translateValues]="{ username: account.login }">
-        <%- getWebappTranslation('password.title', { username: '{{ account.login }}' }) %>
-      </h2>
+      <h2 <%= jhiPrefix %>Translate="password.title" [translateValues]="{ username: account.login }">__jhiTransformTranslate__('password.title', { "username": "{{ account.login }}" })</h2>
 
-      <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="password.messages.success">
-        <%- getWebappTranslation('password.messages.success') %>
-      </div>
+      <div class="alert alert-success" *ngIf="success" <%= jhiPrefix %>Translate="password.messages.success">__jhiTransformTranslate__('password.messages.success')</div>
 
-      <div class="alert alert-danger" *ngIf="error" <%= jhiPrefix %>Translate="password.messages.error">
-         <%- getWebappTranslation('password.messages.error') %>
-      </div>
+      <div class="alert alert-danger" *ngIf="error" <%= jhiPrefix %>Translate="password.messages.error">__jhiTransformTranslate__('password.messages.error')</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>
 
       <form name="form" role="form" (ngSubmit)="changePassword()" [formGroup]="passwordForm">
         <div class="mb-3">
-          <label class="form-label" for="currentPassword" <%= jhiPrefix %>Translate="global.form.currentpassword.label"><%- getWebappTranslation('global.form["currentpassword.label"]') %></label>
+          <label class="form-label" for="currentPassword" <%= jhiPrefix %>Translate="global.form.currentpassword.label">__jhiTransformTranslate__('global.form["currentpassword.label"]')</label>
           <input
             type="password"
             class="form-control"
@@ -58,14 +50,12 @@
               class="form-text text-danger"
               *ngIf="passwordForm.get('currentPassword')?.errors?.required"
               <%= jhiPrefix %>Translate="global.messages.validate.newpassword.required"
-            >
-              <%- getWebappTranslation('global.messages.validate.newpassword.required') %>
-            </small>
+            >__jhiTransformTranslate__('global.messages.validate.newpassword.required')</small>
           </div>
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="newPassword" <%= jhiPrefix %>Translate="global.form.newpassword.label"><%- getWebappTranslation('global.form["newpassword.label"]') %></label>
+          <label class="form-label" for="newPassword" <%= jhiPrefix %>Translate="global.form.newpassword.label">__jhiTransformTranslate__('global.form["newpassword.label"]')</label>
           <input
             type="password"
             class="form-control"
@@ -86,32 +76,26 @@
               class="form-text text-danger"
               *ngIf="passwordForm.get('newPassword')?.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="passwordForm.get('newPassword')?.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="passwordForm.get('newPassword')?.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]="passwordForm.get('newPassword')!.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"
@@ -132,25 +116,19 @@
               class="form-text text-danger"
               *ngIf="passwordForm.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="passwordForm.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="passwordForm.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>
 
@@ -160,9 +138,7 @@
           class="btn btn-primary"
           <%= jhiPrefix %>Translate="password.form.button"
           data-cy="submit"
-        >
-          <%- getWebappTranslation('password.form.button') %>
-        </button>
+        >__jhiTransformTranslate__('password.form.button')</button>
       </form>
     </div>
   </div>

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs

@@ -19,33 +19,29 @@
 <div>
   <div class="d-flex justify-content-center">
     <div class="col-md-4">
-      <h1 <%= jhiPrefix %>Translate="reset.finish.title"><%- getWebappTranslation('reset.finish.title') %></h1>
+      <h1 <%= jhiPrefix %>Translate="reset.finish.title">__jhiTransformTranslate__('reset.finish.title')</h1>
 
-      <div class="alert alert-danger" <%= jhiPrefix %>Translate="reset.finish.messages.keymissing" *ngIf="initialized && !key">
-        <%- getWebappTranslation('reset.finish.messages.keymissing') %>
-      </div>
+      <div class="alert alert-danger" <%= jhiPrefix %>Translate="reset.finish.messages.keymissing" *ngIf="initialized && !key">__jhiTransformTranslate__('reset.finish.messages.keymissing')</div>
 
       <div class="alert alert-warning" *ngIf="key && !success">
-        <span <%= jhiPrefix %>Translate="reset.finish.messages.info"><%- getWebappTranslation('reset.finish.messages.info') %></span>
+        <span <%= jhiPrefix %>Translate="reset.finish.messages.info">__jhiTransformTranslate__('reset.finish.messages.info')</span>
       </div>
 
       <div class="alert alert-danger" *ngIf="error">
-        <span <%= jhiPrefix %>Translate="reset.finish.messages.error"><%- getWebappTranslation('reset.finish.messages.error') %></span>
+        <span <%= jhiPrefix %>Translate="reset.finish.messages.error">__jhiTransformTranslate__('reset.finish.messages.error')</span>
       </div>
 
       <div class="alert alert-success" *ngIf="success">
-        <span <%= jhiPrefix %>Translate="reset.finish.messages.success"><%- getWebappTranslation('reset.finish.messages.success') %> </span>
-        <a class="alert-link" routerLink="/login" <%= jhiPrefix %>Translate="global.messages.info.authenticated.link"><%- getWebappTranslation('global.messages.info.authenticated.link') %></a>.
+        <span <%= jhiPrefix %>Translate="reset.finish.messages.success">__jhiTransformTranslate__('reset.finish.messages.success')</span>
+        <a class="alert-link" routerLink="/login" <%= jhiPrefix %>Translate="global.messages.info.authenticated.link">__jhiTransformTranslate__('global.messages.info.authenticated.link')</a>.
       </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 *ngIf="key && !success">
         <form name="form" role="form" (ngSubmit)="finishReset()" [formGroup]="passwordForm">
           <div class="mb-3">
-            <label class="form-label" for="newPassword" <%= jhiPrefix %>Translate="global.form.newpassword.label"><%- getWebappTranslation('global.form["newpassword.label"]') %></label>
+            <label class="form-label" for="newPassword" <%= jhiPrefix %>Translate="global.form.newpassword.label">__jhiTransformTranslate__('global.form["newpassword.label"]')</label>
             <input
               type="password"
               class="form-control"
@@ -67,32 +63,26 @@
                 class="form-text text-danger"
                 *ngIf="passwordForm.get('newPassword')?.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="passwordForm.get('newPassword')?.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="passwordForm.get('newPassword')?.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]="passwordForm.get('newPassword')!.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"
@@ -113,25 +103,19 @@
                 class="form-text text-danger"
                 *ngIf="passwordForm.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="passwordForm.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="passwordForm.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>
 
@@ -141,9 +125,7 @@
             class="btn btn-primary"
             <%= jhiPrefix %>Translate="reset.finish.form.button"
             data-cy="submit"
-          >
-              <%- getWebappTranslation('reset.finish.form.button') %>
-          </button>
+          >__jhiTransformTranslate__('reset.finish.form.button')</button>
         </form>
       </div>
     </div>

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs

@@ -19,21 +19,21 @@
 <div>
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
-      <h1 <%= jhiPrefix %>Translate="reset.request.title"><%- getWebappTranslation('reset.request.title') %></h1>
+      <h1 <%= jhiPrefix %>Translate="reset.request.title">__jhiTransformTranslate__('reset.request.title')</h1>
 
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 
       <div class="alert alert-warning" *ngIf="!success">
-        <span <%= jhiPrefix %>Translate="reset.request.messages.info"><%- getWebappTranslation('reset.request.messages.info') %></span>
+        <span <%= jhiPrefix %>Translate="reset.request.messages.info">__jhiTransformTranslate__('reset.request.messages.info')</span>
       </div>
 
       <div class="alert alert-success" *ngIf="success">
-        <span <%= jhiPrefix %>Translate="reset.request.messages.success"><%- getWebappTranslation('reset.request.messages.success') %></span>
+        <span <%= jhiPrefix %>Translate="reset.request.messages.success">__jhiTransformTranslate__('reset.request.messages.success')</span>
       </div>
 
       <form *ngIf="!success" name="form" role="form" (ngSubmit)="requestReset()" [formGroup]="resetRequestForm">
         <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"
@@ -55,33 +55,25 @@
               class="form-text text-danger"
               *ngIf="resetRequestForm.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="resetRequestForm.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="resetRequestForm.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="resetRequestForm.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>
 
@@ -91,9 +83,7 @@
           class="btn btn-primary"
           <%= jhiPrefix %>Translate="reset.request.form.button"
           data-cy="submit"
-        >
-           <%- getWebappTranslation('reset.request.form.button') %>
-        </button>
+        >__jhiTransformTranslate__('reset.request.form.button')</button>
       </form>
     </div>
   </div>