changes to not hardcode internal server error

IABTechLab · Nov 25, 2024 · fe4bd2d · fe4bd2d
1 parent 706cac5
commit fe4bd2d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/public/locales_euid/en.json b/public/locales_euid/en.json
@@ -19,6 +19,8 @@
   "Enter your verification code": "Enter your verification code",
   "Powered by": "Powered by",
   "Internal Server Error": "Internal Server Error",
+  "Page Not Found": "Page Not Found",
+  "Unknown Error": "Unknown Error",
   "euid-exit": "EXIT",
   "Welcome!": "Hello,",
   "Opt-Out": "Opt-Out",

diff --git a/src/app.ts b/src/app.ts
@@ -45,6 +45,7 @@ app.use(helmet());
 app.use(i18n.init);
 app.use((req, _res, next) => {
   const locale = req.acceptsLanguages()[0] || LanguagesUID2.English;
+  console.log(locale)
   i18n.setLocale(locale);
   next();
 });
@@ -75,7 +76,19 @@ app.use((err: any, req: Request, res: Response, _next: NextFunction) => {
 
   // render the error page
   res.status(err.status || 500);
-  res.render('error');
+
+  let errorPageMessage;
+  if (err.status === 404) {
+    errorPageMessage = res.__("Page Not Found")
+  }
+  else if (err.status === 500) {
+    errorPageMessage = res.__("Internal Server Error")
+  }
+  else {
+    errorPageMessage = res.__("Unknown Error")
+  }
+
+  res.render('error', { errorPageMessage });
 });
 
 logger.log('info', `Using locales from ${LOCALE_FOLDER}`);
@@ -100,6 +113,7 @@ Handlebars.registerHelper('__n', (s, count) => {
   return i18n.__n(s, count);
 });
 
+
 Handlebars.registerPartials(layoutPath);
 
 export default app;
diff --git a/views_uid2/error.hbs b/views_uid2/error.hbs
@@ -1 +1,3 @@
-<h1>{{__ "Internal Server Error"}}</h1>
+<h1>
+  {{errorPageMessage}}
+</h1>