switch to __jhiTranslate__

mshima · Sep 12, 2023 · 6df88cd · 6df88cd
1 parent eb0b4d7
commit 6df88cd
Show file tree

Hide file tree

Showing 38 changed files with 320 additions and 496 deletions.
diff --git a/...rators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs b/...rators/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>
diff --git a/...rc/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs b/...rc/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>

diff --git a/...es/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs b/...es/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>

diff --git a/...ebapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs b/...ebapp/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>

diff --git a/...rators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs b/...rators/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>