diff --git a/generators/angular/entity-files-angular.mts b/generators/angular/entity-files-angular.mts index 8d88e4a8ff41..85255713efad 100644 --- a/generators/angular/entity-files-angular.mts +++ b/generators/angular/entity-files-angular.mts @@ -60,16 +60,11 @@ export const angularFiles = { ], }; -export async function writeEntitiesFiles( - this: CoreGenerator, - { application, entities, control }: GeneratorDefinition['writingEntitiesTaskParam'], -) { - await control.loadClientTranslations?.(); - +export async function writeEntitiesFiles(this: CoreGenerator, { application, entities }: GeneratorDefinition['writingEntitiesTaskParam']) { for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) { await this.writeFiles({ sections: angularFiles, - context: { ...application, ...entity, getWebappTranslation: control.getWebappTranslation }, + context: { ...application, ...entity }, }); } } diff --git a/generators/angular/files-angular.mjs b/generators/angular/files-angular.mjs index 59631734a9d6..325da262da98 100644 --- a/generators/angular/files-angular.mjs +++ b/generators/angular/files-angular.mjs @@ -464,16 +464,11 @@ export const files = { ], }; -export async function writeFiles({ application, control }) { +export async function writeFiles({ application }) { if (!application.clientFrameworkAngular) return; - await control.loadClientTranslations?.(); - await this.writeFiles({ sections: files, - context: { - ...application, - getWebappTranslation: control.getWebappTranslation, - }, + context: application, }); } diff --git a/generators/angular/generator.spec.mts b/generators/angular/generator.spec.mts index 77f8ec489bbb..fc257775a446 100644 --- a/generators/angular/generator.spec.mts +++ b/generators/angular/generator.spec.mts @@ -13,7 +13,6 @@ import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/ import Generator from './index.mjs'; import { clientFrameworkTypes } from '../../jdl/jhipster/index.mjs'; import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.mjs'; -import BaseApplicationGenerator from '../base-application/index.mjs'; import { GENERATOR_ANGULAR } from '../generator-list.mjs'; const { snakeCase } = lodash; @@ -77,16 +76,6 @@ const clientAdminFiles = clientSrcDir => [ `${clientSrcDir}app/admin/metrics/metrics.service.spec.ts`, ]; -class MockedLanguagesGenerator extends BaseApplicationGenerator { - get [BaseApplicationGenerator.PREPARING]() { - return { - mockTranslations({ control }) { - control.getWebappTranslation = () => 'translations'; - }, - }; - } -} - describe(`generator - ${clientFramework}`, () => { it('generator-list constant matches folder name', async () => { await expect((await import('../generator-list.mjs'))[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator); @@ -108,8 +97,8 @@ describe(`generator - ${clientFramework}`, () => { runResult = await helpers .run(generatorFile) .withJHipsterConfig(sampleConfig, entities) - .withGenerators([[MockedLanguagesGenerator, 'jhipster:languages']]) - .withMockedGenerators(['jhipster:common']); + .withControl({ getWebappTranslation: () => 'translations' }) + .withMockedGenerators(['jhipster:common', 'jhipster:languages']); }); after(() => runResult.cleanup()); diff --git a/generators/angular/support/translate-angular.mjs b/generators/angular/support/translate-angular.mjs index 6cf2cba5de2e..e2c4226af01f 100644 --- a/generators/angular/support/translate-angular.mjs +++ b/generators/angular/support/translate-angular.mjs @@ -105,7 +105,7 @@ function replaceErrorMessage(getWebappTranslation, content) { * @this {import('../generator-base.js')} */ export const createTranslationReplacer = (getWebappTranslation, enableTranslation) => { - const htmlJhiTranslateReplacer = createJhiTransformTranslateReplacer(getWebappTranslation, { escapeHtml: true }); + const htmlJhiTranslateReplacer = createJhiTransformTranslateReplacer(getWebappTranslation); const htmlJhiTranslateStringifyReplacer = createJhiTransformTranslateStringifyReplacer(getWebappTranslation); return function replaceAngularTranslations(content, filePath) { if (/\.html$/.test(filePath)) { @@ -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); @@ -128,7 +132,7 @@ export const createTranslationReplacer = (getWebappTranslation, enableTranslatio }; }; -const minimatch = new Minimatch('**/*{.html,.route.ts,.module.ts}'); +const minimatch = new Minimatch('**/*{.html,.component.ts,.route.ts,.module.ts}'); export const isTranslatedAngularFile = file => minimatch.match(file.path); const translateAngularFilesTransform = (getWebappTranslation, enableTranslation) => { diff --git a/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs b/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs index c3a422aaa26a..4d00407e5382 100644 --- a/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs @@ -19,7 +19,7 @@
-

Translate="password.title" [translateValues]="{ username: account.login }">__jhiTransformTranslate__('password.title', { username: '{{ account.login }}' })

+

Translate="password.title" [translateValues]="{ username: account.login }">__jhiTransformTranslate__('password.title', { "username": "{{ account.login }}" })

Translate="password.messages.success">__jhiTransformTranslate__('password.messages.success')
diff --git a/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs b/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs index 823d82c662d4..c895e29aeb01 100644 --- a/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs @@ -17,7 +17,7 @@ limitations under the License. -%>
-

Translate="sessions.title" [translateValues]="{ username: account.login }" *ngIf="account">__jhiTransformTranslate__('sessions.title', { username: '{{ account.login }}' })

+

Translate="sessions.title" [translateValues]="{ username: account.login }" *ngIf="account">__jhiTransformTranslate__('sessions.title', { "username": "{{ account.login }}" })

Translate="sessions.messages.success">__jhiTransformTranslate__('sessions.messages.success')
diff --git a/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs b/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs index dcb795ac6c27..e10391ddb4d2 100644 --- a/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs @@ -19,7 +19,7 @@
-

Translate="settings.title" [translateValues]="{ username: settingsForm.value.login }" *ngIf="settingsForm.value.login">__jhiTransformTranslate__('settings.title', { username: '{{ settingsForm.value.login }}' })

+

Translate="settings.title" [translateValues]="{ username: settingsForm.value.login }" *ngIf="settingsForm.value.login">__jhiTransformTranslate__('settings.title', { "username": "{{ settingsForm.value.login }}" })

Translate="settings.messages.success">__jhiTransformTranslate__('settings.messages.success')
diff --git a/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs index b1b200815f15..9fa979d5da2a 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs @@ -34,7 +34,7 @@
-

Translate="logs.nbloggers" [translateValues]="{ total: loggers.length }">__jhiTransformTranslate__('logs.nbloggers', { total: '{{ loggers.length }}' })

+

Translate="logs.nbloggers" [translateValues]="{ total: loggers.length }">__jhiTransformTranslate__('logs.nbloggers', { "total": "{{ loggers.length }}" })

Translate="logs.filter">__jhiTransformTranslate__('logs.filter') diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs index 045ba1c4225e..ba515f5706b1 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs @@ -26,7 +26,7 @@
<<%= jhiPrefixDashed %>-alert-error>-alert-error> -

Translate="userManagement.delete.question" [translateValues]="{ login: user.login }">__jhiTransformTranslate__('userManagement.delete.question', { login: '{{ user.login }}' })

+

Translate="userManagement.delete.question" [translateValues]="{ login: user.login }">__jhiTransformTranslate__('userManagement.delete.question', { "login": "{{ user.login }}" })

diff --git a/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs index 91d80ac16182..ab3050d02fc8 100644 --- a/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs @@ -44,7 +44,7 @@ *ngIf="editForm.get('login')?.errors?.maxlength" <%= jhiPrefix %>Translate="entity.validation.maxlength" [translateValues]="{ max: 50 }" - >__jhiTransformTranslate__('entity.validation.maxlength', { max: '50' }) + >__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 }) Translate="entity.validation.maxlength" [translateValues]="{ max: 50 }" - >__jhiTransformTranslate__('entity.validation.maxlength', { max: '50' }) + >__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })
@@ -78,7 +78,7 @@ *ngIf="editForm.get('lastName')?.errors?.maxlength" <%= jhiPrefix %>Translate="entity.validation.maxlength" [translateValues]="{ max: 50 }" - >__jhiTransformTranslate__('entity.validation.maxlength', { max: '50' }) + >__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })
@@ -98,14 +98,14 @@ *ngIf="editForm.get('email')?.errors?.maxlength" <%= jhiPrefix %>Translate="entity.validation.maxlength" [translateValues]="{ max: 100 }" - >__jhiTransformTranslate__('entity.validation.maxlength', { max: '100' }) + >__jhiTransformTranslate__('entity.validation.maxlength', { "max": 100 }) Translate="entity.validation.minlength" [translateValues]="{ min: 5 }" - >__jhiTransformTranslate__('entity.validation.minlength', { min: '5' }) + >__jhiTransformTranslate__('entity.validation.minlength', { "min": 5 }) <<%= jhiPrefixDashed %>-alert-error>-alert-error> -

Translate="<%= i18nKeyPrefix %>.delete.question" [translateValues]="{ id: <%= entityInstance %>.<%= primaryKey.name %> }">__jhiTransformTranslate__(i18nKeyPrefix + '.delete.question', { id: '{{ ' + entityInstance + '.' + primaryKey.name + ' }}' })

+

Translate="<%= i18nKeyPrefix %>.delete.question" [translateValues]="{ id: <%= entityInstance %>.<%= primaryKey.name %> }">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.delete.question', { "id": "{{ <%- entityInstance%>.<%- primaryKey.name%> }}" })

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 d2620f7aa27f..7b82a687d5ab 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 @@ -19,7 +19,7 @@
-

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

+

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

@@ -32,7 +32,7 @@ const fieldName = field.fieldName; const fieldType = field.fieldType; _%> -
Translate="<%= field.fieldTranslationKey %>"<% if (field.javadoc) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.javadoc %>"<% } } %>>__jhiTransformTranslate__(field.fieldTranslationKey)
+
Translate="<%= field.fieldTranslationKey %>"<% if (field.javadoc) { if (enableTranslation) { %> [ngbTooltip]="'<%= i18nKeyPrefix %>.help.<%= fieldName %>' | translate"<% } else { %> ngbTooltip="<%= field.javadoc %>"<% } } %>>__jhiTransformTranslate__('<%- field.fieldTranslationKey %>')
<%_ if (field.fieldIsEnum) { _%> <%# TODO: import enum and use its key as label _%> @@ -71,7 +71,7 @@ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedde const otherEntityField = relationship.otherEntityField; if (ownerSide) { _%> -
Translate="<%= i18nKeyPrefix %>.<%= relationshipName %>">__jhiTransformTranslate__(i18nKeyPrefix + '.' + relationshipName)
+
Translate="<%= i18nKeyPrefix %>.<%= relationshipName %>">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.<%- relationshipName %>')
<%_ if (relationship.otherEntityUser) { _%> <%_ if (relationship.collection) { _%> 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 385d9558328a..08ecfdad389d 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') + Translate="<%= i18nKeyPrefix %>.home.title">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.home.title')
<%_ if (!readOnly) { _%> <%_ } _%>
@@ -43,7 +43,7 @@
- + <%_ } _%> <%_ } _%> 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 03669d262fc3..cde67345c198 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')

+

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

<<%= jhiPrefixDashed %>-alert-error>-alert-error> @@ -109,23 +109,23 @@ _%> <%_ } _%> <%_ if (field.fieldValidationMinLength) { _%> Translate="entity.validation.minlength" [translateValues]="{ min: <%= field.fieldValidateRulesMinlength %> }">__jhiTransformTranslate__('entity.validation.minlength', { min: field.fieldValidateRulesMinlength }) + *ngIf="editForm.get('<%= fieldName %>')?.errors?.minlength" <%= jhiPrefix %>Translate="entity.validation.minlength" [translateValues]="{ min: <%= field.fieldValidateRulesMinlength %> }">__jhiTransformTranslate__('entity.validation.minlength', { "min": <%- field.fieldValidateRulesMinlength %> }) <%_ } _%> <%_ if (field.fieldValidationMaxLength) { _%> Translate="entity.validation.maxlength" [translateValues]="{ max: <%= field.fieldValidateRulesMaxlength %> }">__jhiTransformTranslate__('entity.validation.maxlength', { max: field.fieldValidateRulesMaxlength }) + *ngIf="editForm.get('<%= fieldName %>')?.errors?.maxlength" <%= jhiPrefix %>Translate="entity.validation.maxlength" [translateValues]="{ max: <%= field.fieldValidateRulesMaxlength %> }">__jhiTransformTranslate__('entity.validation.maxlength', { "max": <%- field.fieldValidateRulesMaxlength %> }) <%_ } _%> <%_ if (field.fieldValidationMin) { _%> Translate="entity.validation.min" [translateValues]="{ min: <%= field.fieldValidateRulesMin %> }">__jhiTransformTranslate__('entity.validation.min', { min: field.fieldValidateRulesMin }) + *ngIf="editForm.get('<%= fieldName %>')?.errors?.min" <%= jhiPrefix %>Translate="entity.validation.min" [translateValues]="{ min: <%= field.fieldValidateRulesMin %> }">__jhiTransformTranslate__('entity.validation.min', { "min": <%- field.fieldValidateRulesMin %> }) <%_ } _%> <%_ if (field.fieldValidationMax) { _%> Translate="entity.validation.max" [translateValues]="{ max: <%= field.fieldValidateRulesMax %> }">__jhiTransformTranslate__('entity.validation.max', { max: field.fieldValidateRulesMax }) + *ngIf="editForm.get('<%= fieldName %>')?.errors?.max" <%= jhiPrefix %>Translate="entity.validation.max" [translateValues]="{ max: <%= field.fieldValidateRulesMax %> }">__jhiTransformTranslate__('entity.validation.max', { "max": <%- field.fieldValidateRulesMax %> }) <%_ } _%> <%_ if (field.fieldValidationPattern) { _%> Translate="entity.validation.pattern" [translateValues]="{ pattern: '<%= fieldNameHumanized %>' }">__jhiTransformTranslate__('entity.validation.pattern', { pattern: fieldNameHumanized }) + *ngIf="editForm.get('<%= fieldName %>')?.errors?.pattern" <%= jhiPrefix %>Translate="entity.validation.pattern" [translateValues]="{ pattern: '<%= fieldNameHumanized %>' }">__jhiTransformTranslate__('entity.validation.pattern', { "pattern": "<%- fieldNameHumanized %>" }) <%_ } _%> <%_ if (field.fieldTypeNumeric || field.fieldTypeDuration) { _%> <%_ if (relationship.relationshipManyToOne || (relationship.relationshipOneToOne && ownerSide)) { _%>
- + diff --git a/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs b/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs index 27c49bc39616..a95a3a604bac 100644 --- a/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +++ b/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs @@ -29,7 +29,7 @@
Translate="home.logged.message" - [translateValues]="{ username: account.login }">__jhiTransformTranslate__('home.logged.message', { username: '{{ account.login }}' }) + [translateValues]="{ username: account.login }">__jhiTransformTranslate__('home.logged.message', { "username": "{{ account.login }}" })
diff --git a/generators/base-application/priorities.mjs b/generators/base-application/priorities.mjs index 71e2ae0e683f..6da721d4708e 100644 --- a/generators/base-application/priorities.mjs +++ b/generators/base-application/priorities.mjs @@ -45,6 +45,9 @@ const WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${WRITING_ENTITIES}`; const POST_WRITING_ENTITIES = 'postWritingEntities'; const POST_WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${POST_WRITING_ENTITIES}`; +const LOADING_TRANSLATIONS = 'loadingTranslations'; +const LOADING_TRANSLATIONS_QUEUE = `${QUEUE_PREFIX}${LOADING_TRANSLATIONS}`; + export const CUSTOM_PRIORITIES = [ { priorityName: CONFIGURING_EACH_ENTITY, @@ -91,6 +94,12 @@ export const CUSTOM_PRIORITIES = [ { priorityName: POST_WRITING_ENTITIES, queueName: POST_WRITING_ENTITIES_QUEUE, + before: LOADING_TRANSLATIONS, + skip: true, + }, + { + priorityName: LOADING_TRANSLATIONS, + queueName: LOADING_TRANSLATIONS_QUEUE, before: TRANSFORM, skip: true, }, @@ -105,6 +114,7 @@ const ENTITY_QUEUES = { POST_PREPARING_EACH_ENTITY_QUEUE, WRITING_ENTITIES_QUEUE, POST_WRITING_ENTITIES_QUEUE, + LOADING_TRANSLATIONS_QUEUE, }; export const ENTITY_PRIORITY_NAMES = { @@ -146,6 +156,7 @@ export const PRIORITY_NAMES_LIST = [ WRITING_ENTITIES, PRIORITY_NAMES.POST_WRITING, POST_WRITING_ENTITIES, + LOADING_TRANSLATIONS, PRIORITY_NAMES_BASE.INSTALL, PRIORITY_NAMES_BASE.POST_INSTALL, PRIORITY_NAMES_BASE.END, diff --git a/generators/base/types.d.mts b/generators/base/types.d.mts index 3c2566358033..7ec8460029d0 100644 --- a/generators/base/types.d.mts +++ b/generators/base/types.d.mts @@ -9,6 +9,4 @@ export type Control = { */ blueprintConfigured?: boolean; reproducibleLiquibaseTimestamp?: Date; - - loadClientTranslations?: () => Promise; }; diff --git a/generators/languages/entity-files.mjs b/generators/languages/entity-files.mjs index 5f90ebeae017..e1d91be929ac 100644 --- a/generators/languages/entity-files.mjs +++ b/generators/languages/entity-files.mjs @@ -80,13 +80,14 @@ export function writeEntityFiles() { }, async writeClientFiles({ application, entities }) { - if (!application.enableTranslation || application.skipClient) return; + if (application.skipClient) return; const entitiesToWriteTranslationFor = entities.filter(entity => !entity.skipClient && !entity.builtIn); // Copy each const { clientSrcDir, frontendAppName } = application; + const languagesToApply = application.enableTranslation ? this.languagesToApply : [...new Set([application.nativeLanguage, 'en'])]; for (const entity of entitiesToWriteTranslationFor) { - for (const lang of this.languagesToApply) { + for (const lang of languagesToApply) { await this.writeFiles({ sections: entityClientI18nFiles, context: { ...entity, clientSrcDir, frontendAppName, lang } }); } } diff --git a/generators/languages/generator.mjs b/generators/languages/generator.mjs index c7c93f456a32..d77ea77e01be 100644 --- a/generators/languages/generator.mjs +++ b/generators/languages/generator.mjs @@ -26,7 +26,7 @@ import statistics from '../statistics.mjs'; import { GENERATOR_LANGUAGES, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.mjs'; import { clientI18nFiles } from './files.mjs'; import { writeEntityFiles } from './entity-files.mjs'; -import TranslationData from './translation-data.mjs'; +import TranslationData, { createTranslationsFileFilter, createTranslationsFilter } from './translation-data.mjs'; import { findLanguageForTag, supportedLanguages } from './support/languages.mjs'; import { updateLanguagesTask as updateLanguagesInAngularTask } from '../angular/support/index.mjs'; import { updateLanguagesTask as updateLanguagesInReact } from '../react/support/index.mjs'; @@ -35,6 +35,7 @@ import { updateLanguagesTask as updateLanguagesInJava } from '../server/support/ import { SERVER_MAIN_RES_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.mjs'; import upgradeFilesTask from './upgrade-files-task.mjs'; import command from './command.mjs'; +import { QUEUES } from '../base-application/priorities.mjs'; const { startCase } = _; @@ -45,6 +46,7 @@ const { startCase } = _; * @extends {BaseApplicationGenerator} */ export default class LanguagesGenerator extends BaseApplicationGenerator { + translationData; supportedLanguages; languages; /** @@ -185,19 +187,19 @@ export default class LanguagesGenerator extends BaseApplicationGenerator { } else { this.languagesToApply = [...new Set(this.languagesToApply || [])]; } + } - source.addEntityTranslationKey = ({ translationKey, translationValue, language }) => { - this.mergeDestinationJson(`${application.clientSrcDir}i18n/${language}/global.json`, { - global: { - menu: { - entities: { - [translationKey]: translationValue, - }, + source.addEntityTranslationKey = ({ translationKey, translationValue, language }) => { + this.mergeDestinationJson(`${application.clientSrcDir}i18n/${language}/global.json`, { + global: { + menu: { + entities: { + [translationKey]: translationValue, }, }, - }); - }; - } + }, + }); + }; }, }); } @@ -207,40 +209,27 @@ export default class LanguagesGenerator extends BaseApplicationGenerator { } get default() { - return { - async loadNativeLanguage({ application, entities, control }) { - this.translationData = new TranslationData(this, control); - - const loadClientTranslations = async () => { - await this.translationData.loadClientTranslations(application); - for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) { - await this.translationData.loadEntityClientTranslations(application, entity); + return this.asDefaultTaskGroup({ + async loadNativeLanguage({ application, control }) { + control.translations = control.translations ?? {}; + this.translationData = new TranslationData({ generator: this, translations: control.translations }); + const { clientSrcDir, enableTranslation, nativeLanguage } = application; + const fallbackLanguage = 'en'; + this.queueLoadLanguages({ clientSrcDir, enableTranslation, nativeLanguage, fallbackLanguage }); + const filter = createTranslationsFilter({ clientSrcDir, nativeLanguage, fallbackLanguage }); + this.env.sharedFs.on('change', filePath => { + if (filter(filePath)) { + this.queueLoadLanguages({ clientSrcDir, enableTranslation, nativeLanguage, fallbackLanguage }); } - }; - - if (application.enableTranslation) { - // Translation is normally not needed, add support on demand for angular. - control.getWebappTranslation = () => { - throw new Error( - `Translations are not loaded, call ${chalk.yellow("'await control.loadClientTranslations'")} to load translations`, - ); - }; + }); - control.loadClientTranslations = async () => { - await loadClientTranslations(); - control.getWebappTranslation = (...args) => this.translationData.getClientTranslation(...args); - delete control.loadClientTranslations; - }; - } else { - await loadClientTranslations(); - control.getWebappTranslation = (...args) => this.translationData.getClientTranslation(...args); - } + control.getWebappTranslation = (...args) => this.translationData.getClientTranslation(...args); }, insight() { statistics.sendSubGenEvent('generator', GENERATOR_LANGUAGES); }, - }; + }); } get [BaseApplicationGenerator.DEFAULT]() { @@ -252,9 +241,10 @@ export default class LanguagesGenerator extends BaseApplicationGenerator { return { upgradeFilesTask, async writeClientTranslations({ application }) { - if (!application.enableTranslation || application.skipClient) return; + if (application.skipClient) return; + const languagesToApply = application.enableTranslation ? this.languagesToApply : [...new Set([application.nativeLanguage, 'en'])]; await Promise.all( - this.languagesToApply.map(lang => + languagesToApply.map(lang => this.writeFiles({ sections: clientI18nFiles, context: { @@ -343,9 +333,10 @@ export default class LanguagesGenerator extends BaseApplicationGenerator { get postWritingEntities() { return this.asPostWritingEntitiesTaskGroup({ - addEntities({ entities, source }) { + addEntities({ application, entities, source }) { + const languagesToApply = application.enableTranslation ? this.languagesToApply : [...new Set([application.nativeLanguage, 'en'])]; for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) { - for (const language of this.languagesToApply) { + for (const language of languagesToApply) { source.addEntityTranslationKey?.({ language, translationKey: entity.entityTranslationKeyMenu, @@ -370,4 +361,28 @@ export default class LanguagesGenerator extends BaseApplicationGenerator { this.jhipsterConfig.languages = languages.map(lang => languagesToMigrate[lang] ?? lang); } } + + queueLoadLanguages({ enableTranslation, clientSrcDir, nativeLanguage, fallbackLanguage = 'en' }) { + this.queueTask({ + method: async () => { + const filter = createTranslationsFileFilter({ clientSrcDir, nativeLanguage, fallbackLanguage }); + await this.env.applyTransforms([this.translationData.loadFromStreamTransform({ clientSrcDir, nativeLanguage, fallbackLanguage })], { + name: 'loading translations', + streamOptions: { filter }, + }); + if (!enableTranslation) { + await this.env.applyTransforms( + [this.translationData.clearTranslationsStatusTransform({ clientSrcDir, nativeLanguage, fallbackLanguage })], + { + name: 'clearing translations', + streamOptions: { filter }, + }, + ); + } + }, + taskName: 'loadingTranslations', + queueName: QUEUES.LOADING_TRANSLATIONS_QUEUE, + once: true, + }); + } } diff --git a/generators/languages/support/translate.mts b/generators/languages/support/translate.mts index b88b507ea39b..0225092a8223 100644 --- a/generators/languages/support/translate.mts +++ b/generators/languages/support/translate.mts @@ -17,7 +17,7 @@ * limitations under the License. */ -const TRANSLATE_FUNCTION_ARGS = /\(\s*'(?[^']+)'(?:,\s*(?\{[^}]*\}))?\s*\)/g.source; +const TRANSLATE_FUNCTION_ARGS = /\(\s*'(?[^']+)'(?:,\s*(?\{(?:(?!\}\))[\s\S])*\}))?\)/gs.source; function getTranslationValue(getWebappTranslation, key, data) { return getWebappTranslation(key, data) || undefined; @@ -61,26 +61,14 @@ export const replaceTranslationKeysWithText = ( let data; if (interpolate) { - const interpolateMatches = interpolate.matchAll(/(?[^{\s:,}]+)(?::\s*(?[^,}]+))?/g); data = {}; - for (const interpolateMatch of interpolateMatches) { - const field = interpolateMatch!.groups!.field; - let value: any = interpolateMatch!.groups!.value; - if (value === undefined) { - value = key; + try { + const interpolateValues = JSON.parse(interpolate); + for (const [field, value] of Object.entries(interpolateValues)) { + data[field] = value; } - value = value.trim(); - if (/^\d+$/.test(value)) { - // convert integer - value = parseInt(value, 10); - } else if (/^'.*'$/.test(value) || /^".*"$/.test(value)) { - // extract string value - value = value.substring(1, value.length - 2); - } else { - // wrap expression - value = `{${value}}`; - } - data[field] = value; + } catch { + throw new Error(`Translation interpolations values should be a JSON, ${interpolate}`); } } diff --git a/generators/languages/support/translate.spec.mjs b/generators/languages/support/translate.spec.mjs index d8670f2725d3..e5e8492cc7e0 100644 --- a/generators/languages/support/translate.spec.mjs +++ b/generators/languages/support/translate.spec.mjs @@ -53,14 +53,14 @@ global-translated-"-'-value-0 it('should replace __jhiTransformTranslate__ function with interpolation', () => { const body = ` -__jhiTransformTranslate__('global', { min:20, max: 50, pattern: '^[a-zA-Z0-9]*$', -anotherPattern: "^[a-zA-Z0-9]*$", -dynamic: exec(), +__jhiTransformTranslate__('global', { "min":20, "max": 50, "pattern": "^[a-zA-Z0-9]*$", +"anotherPattern": "^[a-zA-Z0-9]*$", +"dynamic": "exec()" }) `; expect(jhiTransformTranslate(body)).toMatchInlineSnapshot(` " -global-{"min":20,"max":50,"pattern":"^[a-zA-Z0-9]*","anotherPattern":"^[a-zA-Z0-9]*","dynamic":"{exec()}"}-translated-"-'-value-0 +global-{"min":20,"max":50,"pattern":"^[a-zA-Z0-9]*$","anotherPattern":"^[a-zA-Z0-9]*$","dynamic":"exec()"}-translated-"-'-value-0 " `); }); @@ -88,14 +88,20 @@ global-translated-"-'-value-0 it('should replace __jhiTransformTranslate__ function with interpolation', () => { const body = ` -__jhiTransformTranslate__('global', { min:20, max: 50, pattern: '^[a-zA-Z0-9]*$', - anotherPattern: "^[a-zA-Z0-9]*$", - dynamic: exec(), +__jhiTransformTranslate__('global', { "min": 20, "max": 50, "pattern": "^[a-zA-Z0-9]*$", + "anotherPattern": "^[a-zA-Z0-9]*$", + "dynamic": "exec()" }) `; expect(jhiTransformTranslate(body)).toMatchInlineSnapshot(` " -global-{"min":20,"max":50,"pattern":"^[a-zA-Z0-9]*","anotherPattern":"^[a-zA-Z0-9]*","dynamic":"{exec()}"}-translated-"-'-value-0 +global-{"min":20,"max":50,"pattern":"^[a-zA-Z0-9]*__jhiTransformTranslate__('global', { "min": 20, "max": 50, "pattern": "^[a-zA-Z0-9]*$", + "anotherPattern": "^[a-zA-Z0-9]*$", + "dynamic": "exec()" +})quot;,"anotherPattern":"^[a-zA-Z0-9]*__jhiTransformTranslate__('global', { "min": 20, "max": 50, "pattern": "^[a-zA-Z0-9]*$", + "anotherPattern": "^[a-zA-Z0-9]*$", + "dynamic": "exec()" +})quot;,"dynamic":"exec()"}-translated-"-'-value-0 " `); }); @@ -125,14 +131,18 @@ __jhiTransformTranslate__('global') it('should replace __jhiTransformTranslate__ function with interpolation', () => { const body = ` -__jhiTransformTranslate__('global', { min:20, max: 50, pattern: '^[a-zA-Z0-9]*$', - anotherPattern: "^[a-zA-Z0-9]*$", - dynamic: exec(), +__jhiTransformTranslate__('global', { "min":20, "max": 50, "pattern": "^[a-zA-Z0-9]*$", + "anotherPattern": "^[a-zA-Z0-9]*$", + "dynamic": "exec()" }) +__jhiTransformTranslate__('logs.nbloggers', { "total": "{{ loggers.length }}" }) + `; expect(jhiTransformTranslate(body)).toMatchInlineSnapshot(` " -"global-{"min":20,"max":50,"pattern":"^[a-zA-Z0-9]*","anotherPattern":"^[a-zA-Z0-9]*","dynamic":"{exec()}"}-translated-"-'-value-0" +"global-{"min":20,"max":50,"pattern":"^[a-zA-Z0-9]*$","anotherPattern":"^[a-zA-Z0-9]*$","dynamic":"exec()"}-translated-"-'-value-0" +"logs.nbloggers-{"total":"{{ loggers.length }}"}-translated-"-'-value-1" + " `); }); diff --git a/generators/languages/translation-data.mjs b/generators/languages/translation-data.mjs index 868c5bade835..e9699687b35f 100644 --- a/generators/languages/translation-data.mjs +++ b/generators/languages/translation-data.mjs @@ -18,95 +18,62 @@ */ import { inspect } from 'node:util'; import _ from 'lodash'; -import { entityClientI18nFiles } from './entity-files.mjs'; -import { clientI18nFiles } from './files.mjs'; +import { passthrough } from '@yeoman/transform'; +import { Minimatch } from 'minimatch'; +import { clearFileState } from 'mem-fs-editor/state'; const { get } = _; +export const createTranslationsFilter = ({ clientSrcDir, nativeLanguage, fallbackLanguage }) => { + const pattern = + !fallbackLanguage || nativeLanguage === fallbackLanguage + ? `**/${clientSrcDir}i18n/${nativeLanguage}/*.json` + : `**/${clientSrcDir}i18n/{${nativeLanguage},${fallbackLanguage}}/*.json`; + const minimatch = new Minimatch(pattern); + return filePath => { + return minimatch.match(filePath); + }; +}; + +export const createTranslationsFileFilter = opts => { + const filter = createTranslationsFilter(opts); + return file => filter(file.path); +}; + export default class TranslationData { - control; translations; - env; generator; - constructor(generator, control) { + constructor({ generator, translations }) { this.generator = generator; - this.control = control; - - if (!this.control.clientTranslations) { - this.control.clientTranslations = {}; - } - - this.translations = this.control.clientTranslations; - this.env = this.generator.env; + this.translations = translations; } - /** - * Load entity client native translation. - */ - async loadEntityClientTranslations(application, entity) { - const { frontendAppName, nativeLanguage = 'en' } = application; - const rootTemplatesPath = this.generator.fetchFromInstalledJHipster('languages/templates'); - const translationFiles = await this.generator.writeFiles({ - sections: entityClientI18nFiles, - rootTemplatesPath, - context: { ...entity, clientSrcDir: '__tmp__', frontendAppName, lang: 'en' }, + loadFromStreamTransform({ clientSrcDir, nativeLanguage, fallbackLanguage = 'en' }) { + const filter = createTranslationsFileFilter({ clientSrcDir, nativeLanguage, fallbackLanguage }); + const minimatchNative = new Minimatch(`**/${clientSrcDir}i18n/${nativeLanguage}/*.json`); + return passthrough(file => { + if (filter(file)) { + const contents = JSON.parse(file.contents.toString()); + this.mergeTranslation(contents, !minimatchNative.match(file.path)); + } }); - - // Add entities to menu translation. - this.translations.global.menu.entities[entity.entityTranslationKeyMenu] = entity.entityClassHumanized; - - if (nativeLanguage && nativeLanguage !== 'en') { - translationFiles.push( - ...(await this.generator.writeFiles({ - sections: entityClientI18nFiles, - rootTemplatesPath, - context: { ...entity, clientSrcDir: '__tmp__', frontendAppName, lang: nativeLanguage }, - })), - ); - } - for (const translationFile of translationFiles) { - _.merge(this.translations, this.generator.readDestinationJSON(translationFile)); - delete this.env.sharedFs.get(translationFile).state; - } } - /** - * Load client native translation. - */ - async loadClientTranslations(application) { - const { nativeLanguage } = application; - const rootTemplatesPath = this.generator.fetchFromInstalledJHipster('languages/templates/'); - - // Prepare and load en translation - const translationFiles = await this.generator.writeFiles({ - sections: clientI18nFiles, - rootTemplatesPath, - context: { - ...application, - lang: 'en', - clientSrcDir: '__tmp__', - }, + clearTranslationsStatusTransform({ clientSrcDir, nativeLanguage, fallbackLanguage = 'en' }) { + const filter = createTranslationsFileFilter({ clientSrcDir, nativeLanguage, fallbackLanguage }); + return passthrough(file => { + if (filter(file)) { + clearFileState(file); + } }); + } - // Prepare and load native translation - if (nativeLanguage && nativeLanguage !== 'en') { - translationFiles.push( - ...(await this.generator.writeFiles({ - sections: clientI18nFiles, - rootTemplatesPath, - context: { - ...application, - lang: application.nativeLanguage, - clientSrcDir: '__tmp__', - }, - })), - ); - } - - for (const translationFile of translationFiles) { - _.merge(this.translations, this.generator.readDestinationJSON(translationFile)); - delete this.env.sharedFs.get(translationFile).state; + mergeTranslation(translation, fallback) { + if (fallback) { + _.defaultsDeep(this.translations, translation); + } else { + _.merge(this.translations, translation); } } diff --git a/generators/react/entity-files-react.mjs b/generators/react/entity-files-react.mjs index 3a2a06ae28f4..98724ff38426 100644 --- a/generators/react/entity-files-react.mjs +++ b/generators/react/entity-files-react.mjs @@ -50,11 +50,7 @@ export const reactFiles = { ], }; -export async function writeEntitiesFiles({ application, entities, control }) { - if (!application.enableTranslation) { - await control.loadClientTranslations?.(); - } - +export async function writeEntitiesFiles({ application, entities }) { for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) { await this.writeFiles({ sections: reactFiles, diff --git a/generators/react/files-react.mjs b/generators/react/files-react.mjs index 1c2cad44992a..b03e4b392edd 100644 --- a/generators/react/files-react.mjs +++ b/generators/react/files-react.mjs @@ -306,13 +306,9 @@ export const files = { ], }; -export async function writeFiles({ application, control }) { +export async function writeFiles({ application }) { if (!application.clientFrameworkReact) return; - if (!application.enableTranslation) { - await control.loadClientTranslations?.(); - } - await this.writeFiles({ sections: files, context: application, diff --git a/generators/vue/generator.mjs b/generators/vue/generator.mjs index a13628f3ba59..fdca222667fa 100644 --- a/generators/vue/generator.mjs +++ b/generators/vue/generator.mjs @@ -138,9 +138,6 @@ export default class VueGenerator extends BaseApplicationGenerator { writeEntityFiles, async queueTranslateTransform({ control, application }) { const { enableTranslation, clientSrcDir } = application; - if (!application.enableTranslation) { - await control.loadClientTranslations?.(); - } const { getWebappTranslation } = control; this.queueTransformStream(translateVueFilesTransform.call(this, { enableTranslation, getWebappTranslation }), { name: 'translating webapp',