From 33d088924440de897535227942fab73f1da224bd Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Fri, 29 Mar 2024 10:25:25 -0300 Subject: [PATCH] convert entities to new translate api --- .../angular/support/translate-angular.ts | 2 +- ...tityFile_-delete-dialog.component.html.ejs | 6 +-- .../_entityFile_-detail.component.html.ejs | 14 +++---- .../list/_entityFile_.component.html.ejs | 28 ++++++------- .../_entityFile_-update.component.html.ejs | 41 ++++++++----------- generators/languages/entity-files.js | 5 ++- 6 files changed, 45 insertions(+), 51 deletions(-) diff --git a/generators/angular/support/translate-angular.ts b/generators/angular/support/translate-angular.ts index 60cfffd0a9b0..6ab51b6792fc 100644 --- a/generators/angular/support/translate-angular.ts +++ b/generators/angular/support/translate-angular.ts @@ -249,7 +249,7 @@ const pipeEnumTranslation = ( } const { value, fallback } = parsedInterpolate; if (enableTranslation) { - return `${prefix}{{ \`${key}.\${value}\` | translate }}${suffix}`; + return `${prefix}{{ '${key}.' + ${value} | translate }}${suffix}`; } const translatedValue = `{{ ${JSON.stringify(getTranslationValue(getWebappTranslation, key))}[${value}]${fallback ? ` ?? ${fallback}` : ''} }}`; diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs index 449deea10583..4f547b4d9cad 100644 --- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs @@ -19,7 +19,7 @@ @if (<%= entityInstance %>) {
-

Translate="entity.delete.title">__jhiTransformTranslate__('entity.delete.title')

+

__jhiTranslateTag__('entity.delete.title')

@@ -32,11 +32,11 @@
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs index 1e5b83b6b3dd..7c3c34ae618e 100644 --- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.html.ejs @@ -20,7 +20,7 @@
@if (<%= entityInstance %>) {
-

Translate="<%= i18nKeyPrefix %>.detail.title">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.detail.title')

+

__jhiTranslateTag__('<%- i18nKeyPrefix %>.detail.title')

@@ -33,11 +33,11 @@ const fieldName = field.fieldName; const fieldType = field.fieldType; _%> -
Translate="<%= field.fieldTranslationKey %>"<% if (field.documentation) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.documentation %>"<% } } %>>__jhiTransformTranslate__('<%- field.fieldTranslationKey %>')
+
[ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.documentation %>"<% } } %>>__jhiTranslateTag__('<%- field.fieldTranslationKey %>')
<%_ if (field.fieldIsEnum) { _%> <%# TODO: import enum and use its key as label _%> - Translate="{{ '<%= frontendAppName %>.<%= fieldType %>.' + <%= entityInstance %>.<%= fieldName %> }}">{{ <%= entityInstance %>.<%= fieldName %> }} + __jhiTranslateTagEnum__('<%= frontendAppName %>.<%= fieldType %>', { "value": "<%= entityInstance %>.<%= fieldName %> ?? 'null'" }) <%_ } else if (field.fieldTypeBinary && field.blobContentTypeImage) { _%> @if (<%= entityInstance %>.<%= fieldName %>) {
@@ -50,7 +50,7 @@ _%> <%_ } else if (field.fieldTypeBinary && field.blobContentTypeAny) { _%> @if (<%= entityInstance %>.<%= fieldName %>) {
- Translate="entity.action.open">__jhiTransformTranslate__('entity.action.open') + __jhiTranslateTag__('entity.action.open') {{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}
} @@ -75,7 +75,7 @@ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedde const otherEntityField = relationship.otherEntityField; if (persistableRelationship) { _%> -
Translate="<%= i18nKeyPrefix %>.<%= relationshipName %>">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.<%- relationshipName %>')
+
__jhiTranslateTag__('<%- i18nKeyPrefix %>.<%- relationshipName %>')
<%_ if (relationship.otherEntityUser) { _%> <%_ if (relationship.collection) { _%> @@ -113,14 +113,14 @@ _%> (click)="previousState()" class="btn btn-info" data-cy="entityDetailsBackButton"> -  Translate="entity.action.back">__jhiTransformTranslate__('entity.action.back') +  __jhiTranslateTag__('entity.action.back') <%_ if (!readOnly && updatableEntity) { _%> <%_ } _%>
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs index ecf4ed136253..5b74c60f168b 100644 --- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs @@ -18,18 +18,18 @@ -%>

- Translate="<%= i18nKeyPrefix %>.home.title">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.home.title') + __jhiTranslateTag__('<%- i18nKeyPrefix %>.home.title')
<%_ if (!readOnly) { _%> <%_ } _%>
@@ -43,8 +43,8 @@
- - + + <%_ } _%> <%_ } _%> - Translate="entity.action.view">__jhiTransformTranslate__('entity.action.view') + __jhiTranslateTag__('entity.action.view') <%_ if (!readOnly && updatableEntity) { _%> - Translate="entity.action.edit">__jhiTransformTranslate__('entity.action.edit') + __jhiTranslateTag__('entity.action.edit') <%_ } _%> <%_ if (!readOnly) { _%> @@ -208,7 +208,7 @@ _%> class="btn btn-danger btn-sm" data-cy="entityDeleteButton"> - Translate="entity.action.delete">__jhiTransformTranslate__('entity.action.delete') + __jhiTranslateTag__('entity.action.delete') <%_ } _%>
diff --git a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs index d39007453ba9..298dda222b51 100644 --- a/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs @@ -19,7 +19,7 @@
-

Translate="<%= i18nKeyPrefix %>.home.createOrEditLabel">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.home.createOrEditLabel')

+

__jhiTranslateTag__('<%- i18nKeyPrefix %>.home.createOrEditLabel')

<<%= jhiPrefixDashed %>-alert-error>-alert-error> @@ -46,13 +46,13 @@ _%> <% if (field.autoGenerate) { %>@if (editForm.controls.<%= field.fieldName %>.value !== null) {<% } %>
- + <%_ if (field.fieldIsEnum) { _%> <%_ } else { _%> @@ -66,7 +66,7 @@ _%> @if (editForm.get('<%= fieldName %>')!.value) {
<%_ if (field.blobContentTypeAny) { _%> - Translate="entity.action.open">__jhiTransformTranslate__('entity.action.open')
+ __jhiTranslateTag__('entity.action.open')
{{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value!) }} <%_ } else { _%> {{ editForm.get('<%= fieldName %>ContentType')!.value }}, {{ byteSize(editForm.get('<%= fieldName %>')!.value!) }} @@ -113,47 +113,41 @@ _%>
<%_ if (field.fieldValidationRequired) { _%> @if (editForm.get('<%= fieldName %>')?.errors?.required) { - Translate="entity.validation.required">__jhiTransformTranslate__('entity.validation.required') + __jhiTranslateTag__('entity.validation.required') } <%_ } _%> <%_ if (field.fieldValidationMinLength) { _%> @if (editForm.get('<%= fieldName %>')?.errors?.minlength) { - Translate="entity.validation.minlength" [translateValues]="{ min: <%= field.fieldValidateRulesMinlength %> }">__jhiTransformTranslate__('entity.validation.minlength', { "min": <%- field.fieldValidateRulesMinlength %> }) + __jhiTranslateValidationTag__('entity.validation.minlength', { "min": <%- field.fieldValidateRulesMinlength %> }) } <%_ } _%> <%_ if (field.fieldValidationMaxLength) { _%> @if (editForm.get('<%= fieldName %>')?.errors?.maxlength) { - Translate="entity.validation.maxlength" [translateValues]="{ max: <%= field.fieldValidateRulesMaxlength %> }">__jhiTransformTranslate__('entity.validation.maxlength', { "max": <%- field.fieldValidateRulesMaxlength %> }) + __jhiTranslateValidationTag__('entity.validation.maxlength', { "max": <%- field.fieldValidateRulesMaxlength %> }) } <%_ } _%> <%_ if (field.fieldValidationMin) { _%> @if (editForm.get('<%= fieldName %>')?.errors?.min) { - Translate="entity.validation.min" [translateValues]="{ min: <%= field.fieldValidateRulesMin %> }">__jhiTransformTranslate__('entity.validation.min', { "min": <%- field.fieldValidateRulesMin %> }) + __jhiTranslateValidationTag__('entity.validation.min', { "min": <%- field.fieldValidateRulesMin %> }) } <%_ } _%> <%_ if (field.fieldValidationMax) { _%> @if (editForm.get('<%= fieldName %>')?.errors?.max) { - Translate="entity.validation.max" [translateValues]="{ max: <%= field.fieldValidateRulesMax %> }">__jhiTransformTranslate__('entity.validation.max', { "max": <%- field.fieldValidateRulesMax %> }) + __jhiTranslateValidationTag__('entity.validation.max', { "max": <%- field.fieldValidateRulesMax %> }) } <%_ } _%> <%_ if (field.fieldValidationPattern) { _%> @if (editForm.get('<%= fieldName %>')?.errors?.pattern) { - Translate="entity.validation.pattern" [translateValues]="{ pattern: '<%= fieldNameHumanized %>' }">__jhiTransformTranslate__('entity.validation.pattern', { "pattern": "<%- fieldNameHumanized %>" }) + __jhiTranslateValidationTag__('entity.validation.pattern', { "pattern": "<%- fieldNameHumanized %>" }) } <%_ } _%> <%_ if (field.fieldTypeNumeric || field.fieldTypeDuration) { _%> Translate="entity.validation.number">__jhiTransformTranslate__('entity.validation.number') + [hidden]="!editForm.get('<%= fieldName %>')?.errors?.number">__jhiTranslateTag__('entity.validation.number') <%_ } _%> <%_ if (field.fieldTypeTimed) { _%> Translate="entity.validation.datetimelocal">__jhiTransformTranslate__('entity.validation.datetimelocal') + [hidden]="!editForm.get('<%= fieldName %>')?.errors?.datetimelocal">__jhiTranslateTag__('entity.validation.datetimelocal') <%_ } _%>
} @@ -171,7 +165,7 @@ _%> <%_ if (relationship.persistableRelationship && !relationship.collection) { _%>
- + @for (<%= otherEntityName %>Option of <%= otherEntity.entityInstancePlural %>SharedCollection; track $index) { @@ -205,8 +199,7 @@ _%>
<%_ if (relationshipRequired) { _%> @if (editForm.get([<%- this.buildAngularFormPath(relationship.reference) %>])?.errors?.required) { - Translate="entity.validation.required">__jhiTransformTranslate__('entity.validation.required') + __jhiTranslateTag__('entity.validation.required') } <%_ } _%>
@@ -217,11 +210,11 @@ _%>
diff --git a/generators/languages/entity-files.js b/generators/languages/entity-files.js index 0c78eabd71bb..97d046f22649 100644 --- a/generators/languages/entity-files.js +++ b/generators/languages/entity-files.js @@ -63,7 +63,8 @@ export const enumClientI18nFiles = { export function writeEntityFiles() { return { async writeEnumFiles({ entities, application }) { - if (!application.enableTranslation || application.skipClient) return; + if (application.skipClient) return; + const languagesToApply = application.enableTranslation ? this.languagesToApply : [...new Set([application.nativeLanguage, 'en'])]; entities = entities.filter(entity => !entity.skipClient && !entity.builtInUser); const { clientSrcDir, packageName, frontendAppName } = application; await Promise.all( @@ -72,7 +73,7 @@ export function writeEntityFiles() { entity.fields .map(field => { if (!field.fieldIsEnum) return undefined; - return this.languagesToApply.map(lang => + return languagesToApply.map(lang => this.writeFiles({ sections: enumClientI18nFiles, context: {