Merge branch 'dev'

2019-09-19 16:27:53 +02:00
parent d264ca4973 1b0921ac42
commit 3cdb29215f
7 changed files with 39 additions and 21 deletions
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -26,14 +26,14 @@ const settingsController = {
        }
      })

-      // initialize user_locale
+      // // initialize user_locale
      if (config.user_locale && fs.existsSync(path.resolve(config.user_locale))) {
        const user_locale = fs.readdirSync(path.resolve(config.user_locale))
        user_locale.forEach( async f => {
          consola.info(`Loading user locale ${f}`)
          const locale = path.basename(f, '.js')
          settingsController.user_locale[locale] =
-            (await import(path.resolve(config.user_locale, f))).default
+            (await require(path.resolve(config.user_locale, f))).default
        })
      }