generator-jhipster 7.1.0 → 7.4.0

package/generators/languages/files.js

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const { CLIENT_MAIN_SRC_DIR } = require('../generator-constants');
+
+module.exports.clientI18nFiles = {
+  clientI18nFiles: [
+    {
+      from: context => `${CLIENT_MAIN_SRC_DIR}/i18n/${context.lang}/`,
+      to: context => `${context.clientSrcDir}/i18n/${context.lang}/`,
+      transform: false,
+      templates: [
+        'error.json',
+        'login.json',
+        'home.json',
+        'password.json',
+        'register.json',
+        'sessions.json',
+        'settings.json',
+        'user-management.json',
+      ],
+    },
+    {
+      from: context => `${CLIENT_MAIN_SRC_DIR}/i18n/${context.lang}/`,
+      to: context => `${context.clientSrcDir}/i18n/${context.lang}/`,
+      templates: ['activate.json', 'global.json', 'reset.json'],
+    },
+    {
+      condition: context => context.withAdminUi,
+      from: context => `${CLIENT_MAIN_SRC_DIR}/i18n/${context.lang}/`,
+      to: context => `${context.clientSrcDir}/i18n/${context.lang}/`,
+      transform: false,
+      templates: [
+        'configuration.json',
+        'logs.json',
+        'metrics.json',
+        {
+          transform: true,
+          file: 'health.json',
+        },
+      ],
+    },
+    {
+      condition: context => context.communicationSpringWebsocket,
+      from: context => `${CLIENT_MAIN_SRC_DIR}/i18n/${context.lang}/`,
+      to: context => `${context.clientSrcDir}/i18n/${context.lang}/`,
+      transform: false,
+      templates: ['tracker.json'],
+    },
+    {
+      condition: context => context.applicationTypeGateway,
+      from: context => `${CLIENT_MAIN_SRC_DIR}/i18n/${context.lang}/`,
+      to: context => `${context.clientSrcDir}/i18n/${context.lang}/`,
+      transform: false,
+      templates: ['gateway.json'],
+    },
+  ],
+};

package/generators/languages/generator.spec.mjs

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import testSupport from '../../test/support/index.cjs';
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+const { testBlueprintSupport } = testSupport;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+  describe.skip('blueprint support', () => testBlueprintSupport(generator));
+});

package/generators/languages/index.js

@@ -24,16 +24,16 @@ const prompts = require('./prompts');
 const statistics = require('../statistics');
 const constants = require('../generator-constants');
 const { translationDefaultConfig } = require('../generator-defaults');
+const { GENERATOR_LANGUAGES } = require('../generator-list');
+const { clientI18nFiles } = require('./files');
 
 const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR;
 const REACT = constants.SUPPORTED_CLIENT_FRAMEWORKS.REACT;
 const VUE = constants.SUPPORTED_CLIENT_FRAMEWORKS.VUE;
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, opts) {
-    super(args, opts, { unique: 'namespace' });
+  constructor(args, options, features) {
+    super(args, options, { unique: 'namespace', ...features });
 
     this.option('skip-prompts', {
       desc: 'Skip prompts',
@@ -88,10 +88,12 @@ module.exports = class extends BaseBlueprintGenerator {
         }
       });
     }
+  }
 
-    useBlueprints =
-      !this.fromBlueprint &&
-      this.instantiateBlueprints('languages', { languages: this.languagesToApply, arguments: this.options.languages });
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints('languages', { languages: this.languagesToApply, arguments: this.options.languages });
+    }
   }
 
   // Public API method used by the getter and also by Blueprints
@@ -116,7 +118,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -129,7 +131,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -168,16 +170,22 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
   // Public API method used by the getter and also by Blueprints
   _loading() {
     return {
+      setDefaultConfig() {
+        this.setConfigDefaults();
+      },
       getSharedConfigOptions() {
         this.loadAppConfig();
+        this.loadDerivedAppConfig();
         this.loadClientConfig();
+        this.loadDerivedClientConfig();
+        this.loadPlatformConfig();
         this.loadServerConfig();
         this.loadTranslationConfig();
       },
@@ -185,7 +193,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -201,14 +209,12 @@ module.exports = class extends BaseBlueprintGenerator {
 
         // Make dist dir available in templates
         this.BUILD_DIR = this.getBuildDirectoryForBuildTool(this.buildTool);
-
-        this.capitalizedBaseName = _.upperFirst(this.baseName);
       },
     };
   }
 
   get preparing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._preparing();
   }
 
@@ -217,30 +223,47 @@ module.exports = class extends BaseBlueprintGenerator {
       ...super._missingPreDefault(),
 
       insight() {
-        statistics.sendSubGenEvent('generator', 'languages');
+        statistics.sendSubGenEvent('generator', GENERATOR_LANGUAGES);
       },
     };
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
   // Public API method used by the getter and also by Blueprints
   _writing() {
     return {
+      async writeClientTranslations() {
+        if (this.skipClient) return;
+        // make it Promise.all() when `this.lang = lang;` can be dropped.
+        for (const lang of this.languagesToApply) {
+          this.lang = lang;
+          await this.writeFiles({ sections: clientI18nFiles });
+        }
+      },
       translateFile() {
         this.languagesToApply.forEach(language => {
-          if (!this.skipClient) {
-            this.installI18nClientFilesByLanguage(this, constants.CLIENT_MAIN_SRC_DIR, language);
-          }
           if (!this.skipServer) {
             this.installI18nServerFilesByLanguage(this, constants.SERVER_MAIN_RES_DIR, language, constants.SERVER_TEST_RES_DIR);
           }
           statistics.sendSubGenEvent('languages/language', language);
         });
       },
+
+      ...super._missingPostWriting(),
+    };
+  }
+
+  get writing() {
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
+  }
+
+  _postWriting() {
+    return {
       write() {
         if (!this.skipClient) {
           this.updateLanguagesInDayjsConfiguation(this.languages);
@@ -268,8 +291,8 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get writing() {
-    if (useBlueprints) return;
-    return this._writing();
+  get postWriting() {
+    if (this.delegateToBlueprint) return {};
+    return this._postWriting();
   }
 };

package/generators/languages/prompts.js

@@ -38,7 +38,7 @@ function askI18n() {
         name: 'nativeLanguage',
         message: 'Please choose the native language of the application',
         choices: () => this.getAllSupportedLanguageOptions(),
-        default: () => detectLanguage(),
+        default: () => (this.options.reproducible ? 'en' : detectLanguage()),
         store: true,
       },
     ],

package/generators/languages/templates/src/main/resources/i18n/messages_pa.properties.ejs

@@ -0,0 +1,41 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+# Error page
+error.title=ਤੁਹਾਡੀ ਬੇਨਤੀ ਤੇ ਕਾਰਵਾਈ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ
+error.subtitle=ਮੁਆਫ ਕਰਨਾ, ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ.
+error.status=ਸਥਿਤੀ:
+error.message=ਸੁਨੇਹਾ:
+
+<%_ if (!skipUserManagement) { _%>
+# Activation email
+email.activation.title=<%= baseName %> ਖਾਤਾ ਐਕਟੀਵੇਸ਼ਨ
+email.activation.greeting=ਪਿਆਰੇ {0}
+email.activation.text1=ਤੁਹਾਡਾ <%= baseName %> ਖਾਤਾ ਬਣਾਇਆ ਗਿਆ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਇਸਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਲਈ ਹੇਠ ਦਿੱਤੇ ਲਿੰਕ ਤੇ ਕਲਿੱਕ ਕਰੋ:
+email.activation.text2=ਸਤਿਕਾਰ ਸਹਿਤ,
+email.signature=<%= baseName %> ਟੀਮ.
+
+# Creation email
+email.creation.text1=ਤੁਹਾਡਾ <%= baseName %> ਖਾਤਾ ਬਣਾਇਆ ਗਿਆ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਹੇਠ ਦਿੱਤੇ ਲਿੰਕ ਤੇ ਕਲਿੱਕ ਕਰੋ:
+
+# Reset email
+email.reset.title=<%= baseName %> ਪਾਸਵਰਡ ਰੀਸੈੱਟ
+email.reset.greeting=ਪਿਆਰੇ {0}
+email.reset.text1=ਤੁਹਾਡੇ <%= baseName %> ਖਾਤੇ ਲਈ ਇੱਕ ਪਾਸਵਰਡ ਰੀਸੈਟ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਗਈ ਸੀ, ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਨੂੰ ਰੀਸੈਟ ਕਰਨ ਲਈ ਹੇਠਾਂ ਦਿੱਤੇ ਲਿੰਕ ਤੇ ਕਲਿਕ ਕਰੋ:
+email.reset.text2=ਸਤਿਕਾਰ ਸਹਿਤ,
+<%_ } _%>

package/generators/languages/templates/src/main/webapp/i18n/al/global.json.ejs

@@ -38,9 +38,9 @@
             },
             "admin": {
                 "main": "Administrim",
-                <%_ if (applicationType === 'gateway') { _%>
+<%_ if (applicationTypeGateway) { _%>
                 "gateway": "Gateway",
-                <%_ } _%>
+<%_ } _%>
                 "userManagement": "Menaxhimi i përdoruesëve",
                 "tracker": "Gjurmimi i përdoruesëve",
                 "metrics": "Metrikat",

package/generators/languages/templates/src/main/webapp/i18n/al/health.json.ejs

@@ -29,30 +29,32 @@
             "error": "Gabim"
         },
         "indicator": {
-            <%_ if (messageBroker === 'kafka') { _%>
+<%_ if (messageBrokerKafka) { _%>
             "binders": "Message broker",
-            <%_ } _%>
-            <%_ if (applicationType === 'gateway' || serviceDiscoveryType) { _%>
+<%_ } _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Microservice Refresh Scope",
             "clientConfigServer": "Microservice Config Server",
-            "hystrix": "Hystrix",<% if (serviceDiscoveryType === 'consul') { %>
-            "consul": "Consul",<% } %>
-            <%_ } _%>
-            <%_ if (cacheProvider === 'hazelcast') { _%>
+            "hystrix": "Hystrix",
+  <%_ if (serviceDiscoveryConsul) { _%>
+            "consul": "Consul",
+  <%_ } _%>
+<%_ } _%>
+<%_ if (cacheProviderHazelcast) { _%>
             "hazelcast": "Hazelcast",
-            <%_ } _%>
+<%_ } _%>
             "diskSpace": "Disk space",
             "mail": "Email",
             "livenessState": "Liveness state",
             "readinessState": "Readiness state",
-            "ping": "Application"<% if (searchEngine === 'elasticsearch') { %>,
-            "elasticsearch": "Elasticsearch"<% } %><% if (databaseType === 'sql' && !reactive) { %>,
-            "db": "Database"<% } %><% if (databaseType === 'sql' && reactive) { %>,
-            "r2dbc": "Database"<% } %><% if (databaseType === 'mongodb') { %>,
-            "mongo": "MongoDB"<% } %><% if (databaseType === 'cassandra') { %>,
-            "cassandra": "Cassandra"<% } %><% if (databaseType === 'couchbase') { %>,
-            "couchbase": "Couchbase"<% } %><% if (databaseType === 'neo4j') { %>,
+            "ping": "Application"<% if (searchEngineElasticsearch) { %>,
+            "elasticsearch": "Elasticsearch"<% } %><% if (databaseTypeSql && !reactive) { %>,
+            "db": "Database"<% } %><% if (databaseTypeSql && reactive) { %>,
+            "r2dbc": "Database"<% } %><% if (databaseTypeMongodb) { %>,
+            "mongo": "MongoDB"<% } %><% if (databaseTypeCassandra) { %>,
+            "cassandra": "Cassandra"<% } %><% if (databaseTypeCouchbase) { %>,
+            "couchbase": "Couchbase"<% } %><% if (databaseTypeNeo4j) { %>,
             "neo4j": "Neo4j"<% } %>
         },
         "table": {

package/generators/languages/templates/src/main/webapp/i18n/ar-ly/global.json.ejs

@@ -38,9 +38,9 @@
             },
             "admin": {
                 "main": "الادارة",
-                <%_ if (applicationType === 'gateway') { _%>
+<%_ if (applicationTypeGateway) { _%>
                 "gateway": "بوابة",
-                <%_ } _%>
+<%_ } _%>
                 "userManagement": "إدارة المستخدم",
                 "tracker": "تعقب المستخدمين",
                 "metrics": "مقاييس",

package/generators/languages/templates/src/main/webapp/i18n/ar-ly/health.json.ejs

@@ -29,30 +29,32 @@
             "error": "خطأ"
         },
         "indicator": {
-            <%_ if (messageBroker === 'kafka') { _%>
+<%_ if (messageBrokerKafka) { _%>
             "binders": "Message broker",
-            <%_ } _%>
-            <%_ if (applicationType === 'gateway' || serviceDiscoveryType) { _%>
+<%_ } _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Microservice Refresh Scope",
             "clientConfigServer": "Microservice Config Server",
-            "hystrix": "Hystrix",<% if (serviceDiscoveryType === 'consul') { %>
-            "consul": "Consul",<% } %>
-            <%_ } _%>
-            <%_ if (cacheProvider === 'hazelcast') { _%>
+            "hystrix": "Hystrix",
+  <%_ if (serviceDiscoveryConsul) { _%>
+            "consul": "Consul",
+  <%_ } _%>
+<%_ } _%>
+<%_ if (cacheProviderHazelcast) { _%>
             "hazelcast": "Hazelcast",
-            <%_ } _%>
+<%_ } _%>
             "diskSpace": "مساحة القرص",
             "mail": "البريد الإلكتروني",
             "livenessState": "Liveness state",
             "readinessState": "Readiness state",
-            "ping": "Application"<% if (searchEngine === 'elasticsearch') { %>,
-            "elasticsearch": "Elasticsearch"<% } %><% if (databaseType === 'sql' && !reactive) { %>,
-            "db": "قاعدة البيانات"<% } %><% if (databaseType === 'sql' && reactive) { %>,
-            "r2dbc": "قاعدة البيانات"<% } %><% if (databaseType === 'mongodb') { %>,
-            "mongo": "MongoDB"<% } %><% if (databaseType === 'cassandra') { %>,
-            "cassandra": "Cassandra"<% } %><% if (databaseType === 'couchbase') { %>,
-            "couchbase": "Couchbase"<% } %><% if (databaseType === 'neo4j') { %>,
+            "ping": "Application"<% if (searchEngineElasticsearch) { %>,
+            "elasticsearch": "Elasticsearch"<% } %><% if (databaseTypeSql && !reactive) { %>,
+            "db": "قاعدة البيانات"<% } %><% if (databaseTypeSql && reactive) { %>,
+            "r2dbc": "قاعدة البيانات"<% } %><% if (databaseTypeMongodb) { %>,
+            "mongo": "MongoDB"<% } %><% if (databaseTypeCassandra) { %>,
+            "cassandra": "Cassandra"<% } %><% if (databaseTypeCouchbase) { %>,
+            "couchbase": "Couchbase"<% } %><% if (databaseTypeNeo4j) { %>,
             "neo4j": "Neo4j"<% } %>
         },
         "table": {

package/generators/languages/templates/src/main/webapp/i18n/bg/global.json.ejs

@@ -38,9 +38,9 @@
             },
             "admin": {
                 "main": "Администрация",
-                <%_ if (applicationType === 'gateway') { _%>
+<%_ if (applicationTypeGateway) { _%>
                 "gateway": "Шлюз",
-                <%_ } _%>
+<%_ } _%>
                 "userManagement": "Управление на потребителите",
                 "tracker": "Тракер на потребителите",
                 "metrics": "Метрики",

package/generators/languages/templates/src/main/webapp/i18n/bg/health.json.ejs

@@ -29,31 +29,34 @@
             "error": "Грешка"
         },
         "indicator": {
-            <%_ if (messageBroker === 'kafka') { _%>
+<%_ if (messageBrokerKafka) { _%>
             "binders": "Брокер за съобщения",
-            <%_ } _%>
-            <%_ if (applicationType === 'gateway' || serviceDiscoveryType) { _%>
+<%_ } _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
             "discoveryComposite": "Компонент за търсене на услуги",
             "refreshScope": "Област за обновяване на микросървиси",
             "clientConfigServer": "Сървър за конфигурации на микросървиси",
-            "hystrix": "Hystrix",<% if (serviceDiscoveryType === 'consul') { %>
-            "consul": "Consul",<% } else if (reactive) { %>
-            "reactiveDiscoveryClients": "Клиенти за откриване на микросървиси",<% } %>
-            <%_ } _%>
-            <%_ if (cacheProvider === 'hazelcast') { _%>
+            "hystrix": "Hystrix",
+  <%_ if (serviceDiscoveryConsul) { _%>
+            "consul": "Consul",
+  <%_ } else if (reactive) { _%>
+            "reactiveDiscoveryClients": "Клиенти за откриване на микросървиси",
+  <%_ } _%>
+<%_ } _%>
+<%_ if (cacheProviderHazelcast) { _%>
             "hazelcast": "Hazelcast",
-            <%_ } _%>
+<%_ } _%>
             "diskSpace": "Място на диска",
             "mail": "Имейл",
             "livenessState": "Liveness state",
             "readinessState": "Readiness state",
-            "ping": "Приложение"<% if (searchEngine === 'elasticsearch') { %>,
-            "elasticsearch": "Elasticsearch"<% } %><% if (databaseType === 'sql' && !reactive) { %>,
-            "db": "База данни"<% } %><% if (databaseType === 'sql' && reactive) { %>,
-            "r2dbc": "База данни"<% } %><% if (databaseType === 'mongodb') { %>,
-            "mongo": "MongoDB"<% } %><% if (databaseType === 'cassandra') { %>,
-            "cassandra": "Cassandra"<% } %><% if (databaseType === 'couchbase') { %>,
-            "couchbase": "Couchbase"<% } %><% if (databaseType === 'neo4j') { %>,
+            "ping": "Приложение"<% if (searchEngineElasticsearch) { %>,
+            "elasticsearch": "Elasticsearch"<% } %><% if (databaseTypeSql && !reactive) { %>,
+            "db": "База данни"<% } %><% if (databaseTypeSql && reactive) { %>,
+            "r2dbc": "База данни"<% } %><% if (databaseTypeMongodb) { %>,
+            "mongo": "MongoDB"<% } %><% if (databaseTypeCassandra) { %>,
+            "cassandra": "Cassandra"<% } %><% if (databaseTypeCouchbase) { %>,
+            "couchbase": "Couchbase"<% } %><% if (databaseTypeNeo4j) { %>,
             "neo4j": "Neo4j"<% } %>
         },
         "table": {

package/generators/languages/templates/src/main/webapp/i18n/bn/global.json.ejs

@@ -38,9 +38,9 @@
             },
             "admin": {
                 "main": "Administration",
-                <%_ if (applicationType === 'gateway') { _%>
+<%_ if (applicationTypeGateway) { _%>
                 "gateway": "Gateway",
-                <%_ } _%>
+<%_ } _%>
                 "userManagement": "User management",
                 "tracker": "User tracker",
                 "metrics": "Metrics",

package/generators/languages/templates/src/main/webapp/i18n/bn/health.json.ejs

@@ -29,30 +29,32 @@
             "error": "Error"
         },
         "indicator": {
-            <%_ if (messageBroker === 'kafka') { _%>
+<%_ if (messageBrokerKafka) { _%>
             "binders": "Message broker",
-            <%_ } _%>
-            <%_ if (applicationType === 'gateway' || serviceDiscoveryType) { _%>
+<%_ } _%>
+<%_ if (applicationTypeGateway || serviceDiscoveryType) { _%>
             "discoveryComposite": "Discovery Composite",
             "refreshScope": "Microservice Refresh Scope",
             "clientConfigServer": "Microservice Config Server",
-            "hystrix": "Hystrix",<% if (serviceDiscoveryType === 'consul') { %>
-            "consul": "Consul",<% } %>
-            <%_ } _%>
-            <%_ if (cacheProvider === 'hazelcast') { _%>
+            "hystrix": "Hystrix",
+  <%_ if (serviceDiscoveryConsul) { _%>
+            "consul": "Consul",
+  <%_ } _%>
+<%_ } _%>
+<%_ if (cacheProviderHazelcast) { _%>
             "hazelcast": "Hazelcast",
-            <%_ } _%>
+<%_ } _%>
             "diskSpace": "Disk space",
             "mail": "Email",
             "livenessState": "Liveness state",
             "readinessState": "Readiness state",
-            "ping": "Application"<% if (searchEngine === 'elasticsearch') { %>,
-            "elasticsearch": "Elasticsearch"<% } %><% if (databaseType === 'sql' && !reactive) { %>,
-            "db": "Database"<% } %><% if (databaseType === 'sql' && reactive) { %>,
-            "r2dbc": "Database"<% } %><% if (databaseType === 'mongodb') { %>,
-            "mongo": "MongoDB"<% } %><% if (databaseType === 'cassandra') { %>,
-            "cassandra": "Cassandra"<% } %><% if (databaseType === 'couchbase') { %>,
-            "couchbase": "Couchbase"<% } %><% if (databaseType === 'neo4j') { %>,
+            "ping": "Application"<% if (searchEngineElasticsearch) { %>,
+            "elasticsearch": "Elasticsearch"<% } %><% if (databaseTypeSql && !reactive) { %>,
+            "db": "Database"<% } %><% if (databaseTypeSql && reactive) { %>,
+            "r2dbc": "Database"<% } %><% if (databaseTypeMongodb) { %>,
+            "mongo": "MongoDB"<% } %><% if (databaseTypeCassandra) { %>,
+            "cassandra": "Cassandra"<% } %><% if (databaseTypeCouchbase) { %>,
+            "couchbase": "Couchbase"<% } %><% if (databaseTypeNeo4j) { %>,
             "neo4j": "Neo4j"<% } %>
         },
         "table": {

package/generators/languages/templates/src/main/webapp/i18n/by/global.json.ejs

@@ -38,9 +38,9 @@
             },
             "admin": {
                 "main": "Адміністраванне",
-                <%_ if (applicationType === 'gateway') { _%>
+<%_ if (applicationTypeGateway) { _%>
                 "gateway": "Шлюз",
-                <%_ } _%>
+<%_ } _%>
                 "userManagement": "Кіраванне карыстальнікамі",
                 "tracker": "Трэкер карыст.",
                 "metrics": "Метрыкі",