adjusts

mshima · Sep 12, 2023 · 12abf6b · 12abf6b
1 parent 722e89b
commit 12abf6b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/generators/angular/support/translate-angular.mjs b/generators/angular/support/translate-angular.mjs
@@ -116,6 +116,10 @@ export const createTranslationReplacer = (getWebappTranslation, enableTranslatio
       content = htmlJhiTranslateReplacer(content);
       content = htmlJhiTranslateStringifyReplacer(content);
     }
+    if (/\.ts$/.test(filePath)) {
+      content = htmlJhiTranslateReplacer(content);
+      content = htmlJhiTranslateStringifyReplacer(content);
+    }
     if (!enableTranslation) {
       if (/(:?route|module)\.ts$/.test(filePath)) {
         content = replacePageTitles(getWebappTranslation, content);

diff --git a/...s/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.html.ejs b/...s/src/main/webapp/app/entities/_entityFolder/detail/_entityFile-detail.component.html.ejs
@@ -71,7 +71,7 @@ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedde
     const otherEntityField = relationship.otherEntityField;
     if (ownerSide) {
 _%>
-        <dt><span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.<%= relationshipName %>">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.' + relationshipName)</span></dt>
+        <dt><span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.<%= relationshipName %>">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.<%- relationshipName %>')</span></dt>
         <dd>
     <%_ if (relationship.otherEntityUser) { _%>
       <%_ if (relationship.collection) { _%>

diff --git a/.../templates/src/main/webapp/app/entities/_entityFolder/list/_entityFile.component.html.ejs b/.../templates/src/main/webapp/app/entities/_entityFolder/list/_entityFile.component.html.ejs
@@ -88,7 +88,7 @@
   _%>
                     <th scope="col" <%= jhiPrefix %>SortBy="<%= relationship.relationshipName + (fieldName) %>">
                         <div class="d-flex">
-                            <span <%= jhiPrefix %>Translate="<%= `${i18nKeyPrefix}.${relationship.relationshipName}` %>">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.' + relationship.relationshipName)</span>
+                            <span <%= jhiPrefix %>Translate="<%= `${i18nKeyPrefix}.${relationship.relationshipName}` %>">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.<%- relationship.relationshipName %>')</span>
                             <fa-icon class="p-1" icon="sort"></fa-icon>
                         </div>
                     </th>

diff --git a/...s/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.html.ejs b/...s/src/main/webapp/app/entities/_entityFolder/update/_entityFile-update.component.html.ejs
@@ -149,7 +149,7 @@ _%>
   <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
 
                 <div class="mb-3">
-                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>">__jhiTransformTranslate__(translationKey)</label>
+                    <label class="form-label" <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipName %>">__jhiTransformTranslate__('<%- translationKey %>')</label>
                     <select class="form-control" id="field_<%= relationshipName %>" data-cy="<%= propertyName %>" name="<%= relationshipName %>" formControlName="<%= propertyName %>" [compareWith]="compare<%= otherEntity.entityAngularName %>">
     <%_ if (!relationshipRequired) { _%>
                         <option [ngValue]="null"></option>
@@ -164,7 +164,7 @@ _%>
   <%_ } else if (relationship.relationshipManyToMany && ownerSide) { _%>
 
                 <div class="mb-3">
-                    <label <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipFieldNamePlural %>">__jhiTransformTranslate__(translationKey)</label>
+                    <label <%= jhiPrefix %>Translate="<%= translationKey %>" for="field_<%= relationshipFieldNamePlural %>">__jhiTransformTranslate__('<%- translationKey %>')</label>
                     <select class="form-control" id="field_<%= relationshipFieldNamePlural %>" data-cy="<%= relationshipFieldName %>" multiple name="<%= propertyName %>" formControlName="<%= propertyName %>" [compareWith]="compare<%= otherEntity.entityAngularName %>">
                         <option [ngValue]="<%= otherEntityName %>Option" *ngFor="let <%= otherEntityName %>Option of <%= otherEntity.entityInstancePlural %>SharedCollection">{{ <%= otherEntityName %>Option.<%= otherEntityField %> }}</option>
                     </select>