Merge branch 'main' into docker

src/app.js

@@ -43,6 +43,16 @@ hbs.registerHelper('section', (name, options) => {
   this._sections[name] = options.fn(this);
   return null;
 })
+hbs.registerHelper('script_tags', (scripts, options) => {
+  if(!scripts) {
+    return null;
+  }
+  var result = [];
+  scripts.forEach((script)=>{
+    result.push(`<script src="${script}"></script>`)
+  })
+  return result.join('\n');
+})
 hbs.registerHelper("embeddedSvgFromPath", require('./lib/utils').embeddedSvgFromPath)
 hbs.registerHelper(require("./controllers/event").helpers)
 hbs.registerHelper(require("./controllers/eventlineup").helpers)
@@ -142,7 +152,7 @@ app.use(require("./routes/eventsheet").router)
 app.use(function (err, req, res, next) {
   // set locals, only providing error in development
   if (err) {
-  res.locals.message = err.message;
+  res.locals.message = req.app.get("env") === "development" ? err.message : "An error has occurred";
   res.locals.error = req.app.get("env") === "development" ? err : {};
   if (typeof err === 'string' || err instanceof String) {
     err = {