Просмотр исходного кода

Merge pull request #6606 from weseek/fix/normalize-installer

fix: Normalize installer
Yuki Takei 3 лет назад
Родитель
Сommit
24e8afd752
2 измененных файлов с 7 добавлено и 1 удалено
  1. 7 0
      packages/app/src/server/crowi/express-init.js
  2. 0 1
      packages/app/src/server/service/app.ts

+ 7 - 0
packages/app/src/server/crowi/express-init.js

@@ -170,4 +170,11 @@ module.exports = function(crowi, app) {
   app.use(middlewares.swigFunctions());
   app.use(middlewares.swigFunctions());
 
 
   // app.use(i18nMiddleware.handle(i18next));
   // app.use(i18nMiddleware.handle(i18next));
+  // TODO: Remove this workaround implementation when i18n works correctly.
+  //       For now, req.t returns string given to req.t(string)
+  app.use((req, res, next) => {
+    req.t = str => (typeof str === 'string' ? str : '');
+
+    next();
+  });
 };
 };

+ 0 - 1
packages/app/src/server/service/app.ts

@@ -114,7 +114,6 @@ export default class AppService implements S2sMessageHandlable {
   }
   }
 
 
   async setupAfterInstall(): Promise<void> {
   async setupAfterInstall(): Promise<void> {
-    await this.crowi.pluginService.autoDetectAndLoadPlugins();
     this.crowi.setupRoutesAtLast();
     this.crowi.setupRoutesAtLast();
     this.crowi.setupGlobalErrorHandlers();
     this.crowi.setupGlobalErrorHandlers();
   }
   }