Adjusts to languages generator. (#15952)

* Make languages generator reproducible * Don't write messages_en.properties when translation is enabled. * Move languages needles to postWriting priority
jhipster · Aug 13, 2021 · e14dae5 · e14dae5
1 parent 85f6365
commit e14dae5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/generators/languages/index.js b/generators/languages/index.js
@@ -245,6 +245,18 @@ module.exports = class extends BaseBlueprintGenerator {
           statistics.sendSubGenEvent('languages/language', language);
         });
       },
+
+      ...super._missingPostWriting(),
+    };
+  }
+
+  get writing() {
+    if (useBlueprints) return;
+    return this._writing();
+  }
+
+  _postWriting() {
+    return {
       write() {
         if (!this.skipClient) {
           this.updateLanguagesInDayjsConfiguation(this.languages);
@@ -272,8 +284,8 @@ module.exports = class extends BaseBlueprintGenerator {
     };
   }
 
-  get writing() {
+  get postWriting() {
     if (useBlueprints) return;
-    return this._writing();
+    return this._postWriting();
   }
 };
diff --git a/generators/languages/prompts.js b/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,
       },
     ],

diff --git a/generators/server/files.js b/generators/server/files.js
@@ -1682,9 +1682,13 @@ const serverFiles = {
       templates: [
         /* User management java test files */
         'templates/mail/testEmail.html',
-        'i18n/messages_en.properties',
       ],
     },
+    {
+      condition: generator => !generator.skipUserManagement && !generator.enableTranslation,
+      path: SERVER_TEST_RES_DIR,
+      templates: ['i18n/messages_en.properties'],
+    },
     {
       condition: generator => !generator.skipUserManagement,
       path: SERVER_TEST_SRC_DIR,

diff --git a/test/blueprint/languages-blueprint.spec.js b/test/blueprint/languages-blueprint.spec.js
@@ -37,6 +37,10 @@ const mockBlueprintSubGen = class extends LanguagesGenerator {
   get writing() {
     return super._writing();
   }
+
+  get postWriting() {
+    return super._postWriting();
+  }
 };
 
 describe('JHipster languages generator with blueprint', () => {

diff --git a/test/needle-api/needle-client-i18n.spec.js b/test/needle-api/needle-client-i18n.spec.js
@@ -55,6 +55,10 @@ const mockBlueprintSubGen = class extends LanguagesGenerator {
     };
     return { ...phaseFromJHipster, ...customPhaseSteps };
   }
+
+  get postWriting() {
+    return super._postWriting();
+  }
 };
 
 describe('needle API i18n: JHipster language generator with blueprint', () => {