generator-jhipster 7.8.0 → 7.9.1

package/generators/entity-client/files.js

@@ -16,12 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const _ = require('lodash');
 const utils = require('../utils');
 const constants = require('../generator-constants');
+const { angularFiles } = require('./files-angular.cjs');
+const { reactFiles } = require('./files-react.cjs');
+const { vueFiles } = require('./files-vue.cjs');
+const { cleanupCypressEntityFiles, writeCypressEntityFiles, cypressEntityFiles: commonFiles } = require('./files-cypress.cjs');
 
 /* Constants use throughout */
-const { CLIENT_TEST_SRC_DIR, ANGULAR_DIR, REACT_DIR, VUE_DIR } = constants;
+const { ANGULAR_DIR, REACT_DIR, VUE_DIR } = constants;
 const { ANGULAR, REACT, VUE } = constants.SUPPORTED_CLIENT_FRAMEWORKS;
 
 const CLIENT_COMMON_TEMPLATES_DIR = 'common';
@@ -29,369 +32,9 @@ const CLIENT_NG2_TEMPLATES_DIR = 'angular';
 const CLIENT_REACT_TEMPLATES_DIR = 'react';
 const CLIENT_VUE_TEMPLATES_DIR = 'vue';
 
-/**
- * The default is to use a file path string. It implies use of the template method.
- * For any other config an object { file:.., method:.., template:.. } can be used
- */
-
-const angularFiles = {
-  client: [
-    {
-      path: ANGULAR_DIR,
-      templates: [
-        {
-          file: 'entities/entity.model.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.model.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => !generator.embedded,
-      path: ANGULAR_DIR,
-      templates: [
-        {
-          file: 'entities/list/entity-management.component.html',
-          method: 'processHtml',
-          template: true,
-          renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.html`,
-        },
-        {
-          file: 'entities/detail/entity-management-detail.component.html',
-          method: 'processHtml',
-          template: true,
-          renameTo: generator => `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.html`,
-        },
-        {
-          file: 'entities/entity-management.module.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.module.ts`,
-        },
-        {
-          file: 'entities/route/entity-management-routing.module.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/route/${generator.entityFileName}-routing.module.ts`,
-        },
-        {
-          file: 'entities/route/entity-management-routing-resolve.service.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/route/${generator.entityFileName}-routing-resolve.service.ts`,
-        },
-        {
-          file: 'entities/list/entity-management.component.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.ts`,
-        },
-        {
-          file: 'entities/detail/entity-management-detail.component.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.ts`,
-        },
-        {
-          file: 'entities/service/entity.service.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/service/${generator.entityFileName}.service.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => !generator.readOnly && !generator.embedded,
-      path: ANGULAR_DIR,
-      templates: [
-        {
-          file: 'entities/update/entity-management-update.component.html',
-          method: 'processHtml',
-          template: true,
-          renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.html`,
-        },
-        {
-          file: 'entities/delete/entity-management-delete-dialog.component.html',
-          method: 'processHtml',
-          template: true,
-          renameTo: generator => `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.html`,
-        },
-        {
-          file: 'entities/update/entity-management-update.component.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.ts`,
-        },
-        {
-          file: 'entities/delete/entity-management-delete-dialog.component.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.ts`,
-        },
-      ],
-    },
-  ],
-  test: [
-    {
-      condition: generator => !generator.embedded,
-      path: ANGULAR_DIR,
-      templates: [
-        {
-          file: 'entities/detail/entity-management-detail.component.spec.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.spec.ts`,
-        },
-        {
-          file: 'entities/list/entity-management.component.spec.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.spec.ts`,
-        },
-        {
-          file: 'entities/route/entity-management-routing-resolve.service.spec.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/route/${generator.entityFileName}-routing-resolve.service.spec.ts`,
-        },
-        {
-          file: 'entities/service/entity.service.spec.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/service/${generator.entityFileName}.service.spec.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => !generator.readOnly && !generator.embedded,
-      path: ANGULAR_DIR,
-      templates: [
-        {
-          file: 'entities/update/entity-management-update.component.spec.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.spec.ts`,
-        },
-        {
-          file: 'entities/delete/entity-management-delete-dialog.component.spec.ts',
-          renameTo: generator =>
-            `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.spec.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.protractorTests && !generator.embedded,
-      path: CLIENT_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'e2e/entities/entity-page-object.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.page-object.ts`,
-        },
-        {
-          file: 'e2e/entities/entity.spec.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.spec.ts`,
-        },
-      ],
-    },
-  ],
-};
-
-const reactFiles = {
-  client: [
-    {
-      condition: generator => !generator.embedded,
-      path: REACT_DIR,
-      templates: [
-        {
-          file: 'entities/entity-detail.tsx',
-          method: 'processJsx',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-detail.tsx`,
-        },
-        {
-          file: 'entities/entity.tsx',
-          method: 'processJsx',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.tsx`,
-        },
-        {
-          file: 'entities/entity.reducer.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.reducer.ts`,
-        },
-        {
-          file: 'entities/index.tsx',
-          method: 'processJsx',
-          renameTo: generator => `entities/${generator.entityFolderName}/index.tsx`,
-        },
-      ],
-    },
-    {
-      path: REACT_DIR,
-      templates: [
-        {
-          file: 'entities/entity.model.ts',
-          renameTo: generator => `shared/model/${generator.entityModelFileName}.model.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => !generator.readOnly && !generator.embedded,
-      path: REACT_DIR,
-      templates: [
-        {
-          file: 'entities/entity-delete-dialog.tsx',
-          method: 'processJsx',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-delete-dialog.tsx`,
-        },
-        {
-          file: 'entities/entity-update.tsx',
-          method: 'processJsx',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-update.tsx`,
-        },
-      ],
-    },
-  ],
-  test: [
-    {
-      condition: generator => !generator.embedded,
-      path: REACT_DIR,
-      templates: [
-        {
-          file: 'entities/entity-reducer.spec.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-reducer.spec.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.protractorTests && !generator.embedded,
-      path: CLIENT_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'e2e/entities/entity-page-object.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.page-object.ts`,
-        },
-        {
-          file: 'e2e/entities/entity.spec.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.spec.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.protractorTests && !generator.readOnly && !generator.embedded,
-      path: CLIENT_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'e2e/entities/entity-update-page-object.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}-update.page-object.ts`,
-        },
-      ],
-    },
-  ],
-};
-
-const vueFiles = {
-  client: [
-    {
-      path: VUE_DIR,
-      templates: [
-        {
-          file: 'entities/entity.model.ts',
-          // using entityModelFileName so that there is no conflict when generating microservice entities
-          renameTo: generator => `shared/model/${generator.entityModelFileName}.model.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => !generator.embedded,
-      path: VUE_DIR,
-      templates: [
-        {
-          file: 'entities/entity-details.vue',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-details.vue`,
-        },
-        {
-          file: 'entities/entity-details.component.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-details.component.ts`,
-        },
-        {
-          file: 'entities/entity.vue',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.vue`,
-        },
-        {
-          file: 'entities/entity.component.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.component.ts`,
-        },
-        {
-          file: 'entities/entity.service.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.service.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => !generator.readOnly && !generator.embedded,
-      path: VUE_DIR,
-      templates: [
-        {
-          file: 'entities/entity-update.vue',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-update.vue`,
-        },
-        {
-          file: 'entities/entity-update.component.ts',
-          renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-update.component.ts`,
-        },
-      ],
-    },
-  ],
-  test: [
-    {
-      condition: generator => !generator.embedded,
-      path: CLIENT_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'spec/app/entities/entity.component.spec.ts',
-          renameTo: generator => `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}.component.spec.ts`,
-        },
-        {
-          file: 'spec/app/entities/entity-details.component.spec.ts',
-          renameTo: generator => `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}-details.component.spec.ts`,
-        },
-        {
-          file: 'spec/app/entities/entity.service.spec.ts',
-          renameTo: generator => `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}.service.spec.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => !generator.readOnly && !generator.embedded,
-      path: CLIENT_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'spec/app/entities/entity-update.component.spec.ts',
-          renameTo: generator => `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}-update.component.spec.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.protractorTests && !generator.embedded,
-      path: CLIENT_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'e2e/entities/entity-page-object.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.page-object.ts`,
-        },
-        {
-          file: 'e2e/entities/entity.spec.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}.spec.ts`,
-        },
-        {
-          file: 'e2e/entities/entity-details-page-object.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}-details.page-object.ts`,
-        },
-      ],
-    },
-    {
-      condition: generator => generator.protractorTests && !generator.readOnly && !generator.embedded,
-      path: CLIENT_TEST_SRC_DIR,
-      templates: [
-        {
-          file: 'e2e/entities/entity-update-page-object.ts',
-          renameTo: generator => `e2e/entities/${generator.entityFolderName}/${generator.entityFileName}-update.page-object.ts`,
-        },
-      ],
-    },
-  ],
-};
-
-const commonFiles = {
-  testsCypress: [
-    {
-      condition: generator => generator.cypressTests && !generator.embedded,
-      path: `${CLIENT_TEST_SRC_DIR}cypress/`,
-      templates: [
-        {
-          file: 'integration/entity/entity.spec.ts',
-          renameTo: generator => `integration/entity/${generator.entityFileName}.spec.ts`,
-        },
-      ],
-    },
-  ],
-};
-
 module.exports = {
   writeFiles,
   addToMenu,
-  replaceTranslations,
   angularFiles,
   reactFiles,
   vueFiles,
@@ -401,7 +44,7 @@ module.exports = {
 function addEnumerationFiles(generator, clientFolder) {
   generator.fields.forEach(field => {
     if (field.fieldIsEnum === true) {
-      const enumFileName = _.kebabCase(field.fieldType);
+      const { enumFileName } = field;
       const enumInfo = {
         ...utils.getEnumInfo(field, generator.clientRootFolder),
         frontendAppName: generator.frontendAppName,
@@ -437,7 +80,7 @@ function addSampleRegexTestingStrings(generator) {
 function writeFiles() {
   return {
     writeClientFiles() {
-      if (this.skipClient || (this.microfrontend && this.applicationTypeGateway && this.microserviceName)) return undefined;
+      if (this.skipClient) return undefined;
       if (this.protractorTests) {
         addSampleRegexTestingStrings(this);
       }
@@ -463,13 +106,11 @@ function writeFiles() {
       addEnumerationFiles(this, clientMainSrcDir);
       if (!files) return undefined;
 
-      return this.writeFilesToDisk(files, templatesDir);
+      return this.writeFiles({ sections: files, rootTemplatesPath: templatesDir });
     },
 
-    writeTestFiles() {
-      if (this.skipClient) return undefined;
-      return this.writeFilesToDisk(commonFiles, 'common');
-    },
+    cleanupCypressEntityFiles,
+    writeCypressEntityFiles,
   };
 }
 
@@ -487,15 +128,3 @@ function addToMenu() {
     );
   }
 }
-
-function replaceTranslations() {
-  if (this.clientFramework === VUE && !this.enableTranslation) {
-    utils.vueReplaceTranslation(this, [
-      `app/entities/${this.entityFolderName}/${this.entityFileName}.vue`,
-      `app/entities/${this.entityFolderName}/${this.entityFileName}-details.vue`,
-    ]);
-    if (!this.readOnly) {
-      utils.vueReplaceTranslation(this, [`app/entities/${this.entityFolderName}/${this.entityFileName}-update.vue`]);
-    }
-  }
-}

package/generators/entity-client/index.js

@@ -23,15 +23,16 @@ const BaseBlueprintGenerator = require('../generator-base-blueprint');
 const { PREPARING_PRIORITY, DEFAULT_PRIORITY, WRITING_PRIORITY, POST_WRITING_PRIORITY } =
   require('../../lib/constants/priorities.cjs').compat;
 
-const { writeFiles, addToMenu, replaceTranslations } = require('./files');
+const { writeFiles, addToMenu } = require('./files');
 const { entityClientI18nFiles } = require('../entity-i18n/files');
+const { clientI18nFiles } = require('../languages/files');
 
 const utils = require('../utils');
 const {
   SUPPORTED_CLIENT_FRAMEWORKS: { ANGULAR, REACT },
 } = require('../generator-constants');
 const { GENERATOR_ENTITY_CLIENT } = require('../generator-list');
-const { POSTGRESQL, MARIADB } = require('../../jdl/jhipster/database-types');
+const { POSTGRESQL, MARIADB, MYSQL } = require('../../jdl/jhipster/database-types');
 
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
@@ -50,9 +51,6 @@ module.exports = class extends BaseBlueprintGenerator {
   // Public API method used by the getter and also by Blueprints
   _preparing() {
     return {
-      async loadNativeLanguage() {
-        await this._loadEntityClientTranslations(this.entity, this.jhipsterConfig);
-      },
       async prepareReact() {
         const entity = this.entity;
         if (!entity.clientFrameworkReact) return;
@@ -73,6 +71,20 @@ module.exports = class extends BaseBlueprintGenerator {
     return {
       ...super._missingPreDefault(),
 
+      async loadNativeLanguage() {
+        await this._loadEntityClientTranslations(this.entity, this.jhipsterConfig);
+
+        const context = {};
+        this.loadAppConfig(undefined, context);
+        this.loadDerivedAppConfig(context);
+        this.loadClientConfig(undefined, context);
+        this.loadDerivedClientConfig(context);
+        this.loadServerConfig(undefined, context);
+        this.loadPlatformConfig(undefined, context);
+        this.loadTranslationConfig(undefined, context);
+        await this._loadClientTranslations(context);
+      },
+
       loadConfigIntoGenerator() {
         utils.copyObjectProps(this, this.entity);
       },
@@ -88,8 +100,8 @@ module.exports = class extends BaseBlueprintGenerator {
         this.cypressBootstrapEntities = true;
 
         const entity = this.entity;
-        // Reactive with PostgreSQL doesn't allow insertion without data.
-        this.workaroundRelationshipReactivePostgress = entity.reactive && entity.prodDatabaseType === POSTGRESQL;
+        // Reactive with some r2dbc databases doesn't allow insertion without data.
+        this.workaroundEntityCannotBeEmpty = entity.reactive && [POSTGRESQL, MYSQL, MARIADB].includes(entity.prodDatabaseType);
         // Reactive with MariaDB doesn't allow null value at Instant fields.
         this.workaroundInstantReactiveMariaDB = entity.reactive && entity.prodDatabaseType === MARIADB;
       },
@@ -122,7 +134,7 @@ module.exports = class extends BaseBlueprintGenerator {
           this.removeFile(`${this.CLIENT_MAIN_SRC_DIR}/app/shared/model/${this.entityModelFileName}.model.ts`);
           this.fields.forEach(field => {
             if (field.fieldIsEnum === true) {
-              const enumFileName = _.kebabCase(field.fieldType);
+              const { enumFileName } = field;
               this.removeFile(`${this.CLIENT_MAIN_SRC_DIR}/app/shared/model/enumerations/${enumFileName}.model.ts`);
             }
           });
@@ -164,14 +176,9 @@ module.exports = class extends BaseBlueprintGenerator {
   _postWriting() {
     return {
       addToMenu() {
-        if (this.skipClient || (this.microfrontend && this.applicationTypeGateway && this.microserviceName)) return undefined;
+        if (this.skipClient) return undefined;
         return addToMenu.call(this);
       },
-
-      replaceTranslations() {
-        if (this.skipClient || (this.microfrontend && this.applicationTypeGateway && this.microserviceName)) return undefined;
-        return replaceTranslations.call(this);
-      },
     };
   }
 
@@ -184,10 +191,12 @@ module.exports = class extends BaseBlueprintGenerator {
    * @experimental
    * Load entity client native translation.
    */
-  async _loadEntityClientTranslations(entity, configContext = this) {
+  async _loadEntityClientTranslations(entity, configContext = this, entityClientTranslations = entity.entityClientTranslations) {
     const { frontendAppName = this.getFrontendAppName(), nativeLanguage = 'en' } = configContext;
-    entity.entityClientTranslations = entity.entityClientTranslations || {};
-    const { entityClientTranslations } = entity;
+    if (!entityClientTranslations) {
+      entity.entityClientTranslations = entity.entityClientTranslations || {};
+      entityClientTranslations = entity.entityClientTranslations;
+    }
     const rootTemplatesPath = this.fetchFromInstalledJHipster('entity-i18n/templates/');
     const translationFiles = await this.writeFiles({
       sections: entityClientI18nFiles,
@@ -207,13 +216,105 @@ module.exports = class extends BaseBlueprintGenerator {
       _.merge(entityClientTranslations, this.readDestinationJSON(translationFile));
       delete this.env.sharedFs.get(translationFile).state;
     }
+
+    if (!this.configOptions.entitiesClientTranslations) {
+      this.configOptions.entitiesClientTranslations = {};
+    }
+    this.entitiesClientTranslations = this.configOptions.entitiesClientTranslations;
+    _.merge(this.entitiesClientTranslations, entityClientTranslations);
   }
 
   /**
    * @experimental
    * Get translation value for a key.
+   *
+   * @param translationKey {string} - key to be translated
+   * @param [data] {object} - template data in case translated value is a template
+   */
+  _getEntityClientTranslation(translationKey, data) {
+    if (translationKey.startsWith('global.') || translationKey.startsWith('entity.')) {
+      return this._getClientTranslation(translationKey, data);
+    }
+    const translatedValue = _.get(this.entitiesClientTranslations, translationKey);
+    if (translatedValue === undefined) {
+      const errorMessage = `Entity translation missing for ${translationKey}`;
+      this.warning(`${errorMessage} at ${JSON.stringify(this.entityClientTranslations)}`);
+      return errorMessage;
+    }
+    if (!data) {
+      return translatedValue;
+    }
+    const compiledTemplate = _.template(translatedValue, { interpolate: /{{([\s\S]+?)}}/g });
+    return compiledTemplate(data);
+  }
+
+  /**
+   * @experimental
+   * Load client native translation.
    */
-  _getEntityClientTranslation(translationKey) {
-    return _.get(this.entityClientTranslations, translationKey, `Translation missing for ${translationKey}`);
+  async _loadClientTranslations(configContext = this) {
+    if (this.configOptions.clientTranslations) {
+      this.clientTranslations = this.configOptions.clientTranslations;
+      return;
+    }
+    const { nativeLanguage } = configContext;
+    this.clientTranslations = this.configOptions.clientTranslations = {};
+    const rootTemplatesPath = this.fetchFromInstalledJHipster('languages/templates/');
+
+    // Prepare and load en translation
+    const translationFiles = await this.writeFiles({
+      sections: clientI18nFiles,
+      rootTemplatesPath,
+      context: {
+        ...configContext,
+        lang: 'en',
+        clientSrcDir: '__tmp__',
+      },
+    });
+
+    // Prepare and load native translation
+    configContext.lang = configContext.nativeLanguage;
+    if (nativeLanguage && nativeLanguage !== 'en') {
+      translationFiles.push(
+        ...(await this.writeFiles({
+          sections: clientI18nFiles,
+          rootTemplatesPath,
+          context: {
+            ...configContext,
+            lang: configContext.nativeLanguage,
+            clientSrcDir: '__tmp__',
+          },
+        }))
+      );
+    }
+    for (const translationFile of translationFiles) {
+      _.merge(this.clientTranslations, this.readDestinationJSON(translationFile));
+      delete this.env.sharedFs.get(translationFile).state;
+    }
+  }
+
+  /**
+   * @experimental
+   * Get translation value for a key.
+   *
+   * @param translationKey {string} - key to be translated
+   * @param [data] {object} - template data in case translated value is a template
+   */
+  _getClientTranslation(translationKey, data) {
+    let translatedValue = _.get(this.clientTranslations, translationKey);
+    if (translatedValue === undefined) {
+      const [last, second, ...others] = translationKey.split('.').reverse();
+      translatedValue = _.get(this.clientTranslations, `${others.reverse().join('.')}['${second}.${last}']`);
+    }
+    if (translatedValue === undefined) {
+      const errorMessage = `Translation missing for ${translationKey}`;
+      this.warning(`${errorMessage} at ${JSON.stringify(this.clientTranslations)}`);
+      return errorMessage;
+    }
+    if (!data) {
+      return translatedValue;
+    }
+    const compiledTemplate = _.template(translatedValue, { interpolate: /{{([\s\S]+?)}}/g });
+    return compiledTemplate(data);
   }
 };

package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs

@@ -18,7 +18,7 @@
 -%>
 <form *ngIf="<%= entityInstance %>" name="deleteForm" (ngSubmit)="confirmDelete(<%= entityInstance %>.<%= primaryKey.name %>!)">
     <div class="modal-header">
-        <h4 class="modal-title" data-cy="<%= entityInstance %>DeleteDialogHeading" <%= jhiPrefix %>Translate="entity.delete.title">Confirm delete operation</h4>
+        <h4 class="modal-title" data-cy="<%= entityInstance %>DeleteDialogHeading" <%= jhiPrefix %>Translate="entity.delete.title"><%- this._getClientTranslation('entity.delete.title') %></h4>
 
         <button type="button" class="btn-close" data-dismiss="modal" aria-hidden="true"
                 (click)="cancel()">&times;</button>
@@ -26,17 +26,16 @@
 
     <div class="modal-body">
         <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
-
-        <p id="<%= jhiPrefixDashed %>-delete-<%= entityInstance %>-heading" <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.delete.question" [translateValues]="{ id: <%= entityInstance %>.<%= primaryKey.name %> }">Are you sure you want to delete this <%= entityClassHumanized %>?</p>
+        <p id="<%= jhiPrefixDashed %>-delete-<%= entityInstance %>-heading" <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.delete.question" [translateValues]="{ id: <%= entityInstance %>.<%= primaryKey.name %> }"><%- this._getEntityClientTranslation(i18nKeyPrefix + '.delete.question', { id: '{{ ' + entityInstance + '.' + primaryKey.name + ' }}' }) %></p>
     </div>
 
     <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
-            <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel">Cancel</span>
+            <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel"><%- this._getClientTranslation('entity.action.cancel') %></span>
         </button>
 
         <button id="<%= jhiPrefixDashed %>-confirm-delete-<%= entityInstance %>" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger">
-            <fa-icon icon="times"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.delete">Delete</span>
+            <fa-icon icon="times"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.delete"><%- this._getClientTranslation('entity.action.delete') %></span>
         </button>
     </div>
 </form>