Fix import of messages from core

aleksis/core/assets/app.js

@@ -19,7 +19,6 @@ import gqlSnackbarItems from "./snackbarItems.graphql";
 import "./css/global.scss";
 import VueI18n from "@/vue-i18n";
 
-import messages from "./messages.json";
 import dateTimeFormats from "./dateTimeFormats.js";
 import routes from "./routes.js";
 
@@ -50,7 +49,7 @@ Vue.use(VueI18n);
 const i18n = new VueI18n({
   locale: "en",
   fallbackLocale: "en",
-  messages,
+  messages: {},
   dateTimeFormats,
 });
 

aleksis/core/vite.config.js

@@ -11,6 +11,19 @@ const license = require("rollup-plugin-license");
 
 const django_values = JSON.parse(fs.readFileSync("./django-vite-values.json"));
 
+function generateMessageImportCode(assetDir, name, importAppName) {
+  let code = "";
+  let messagesPath = assetDir + "/messages/";
+  code += `appMessages["${name}"] = {};`;
+  const files = fs.readdirSync(messagesPath);
+  for (file of files) {
+    let lang = file.split(".")[0];
+    code += `import ${importAppName}Messages_${lang} from '${messagesPath + file}';\n`;
+    code += `appMessages["${name}"]["${lang}"] = ${importAppName}Messages_${lang};\n`;
+  };
+  return code;
+}
+
 function generateAppImporter(appDetails) {
   let code = "let appObjects = {};\n";
   code += "let appMessages = {};\n";
@@ -24,18 +37,14 @@ function generateAppImporter(appDetails) {
     code += `import ${importAppName} from '${indexPath}';\n`;
     code += `appObjects["${appMeta.name}"] = ${importAppName};\n`;
 
-    if appMeta.hasMessages {
-      let messagesPath = appMeta.assetDir + "/messages/";
-      code += `appMessages["${appMeta.name}"] = {}`;
-      fs.readdir(messagesPath, (err, files) => {
-        files.forEach(file => {
-          let lang = file.split(".")[0];
-          code += `import ${importAppName}Messages_${lang} from '${file}';\n`;
-          code += `appMessages["${appMeta.name}"]["${lang}"] = ${importAppName}Messages_${lang};\n`;
-        });
-      });
+    if (appMeta.hasMessages) {
+      code += generateMessageImportCode(appMeta.assetDir, appMeta.name, importAppName);
     }
   }
+
+  // Include core messages
+  code += generateMessageImportCode(django_values.coreAssetDir, "core", "Core");
+
   code += "export default appObjects;\n";
   code += "export { appObjects, appMessages };\n";