Merge from git

pages/_error.js

@@ -24,11 +24,11 @@ function Error({ statusCode }, props) {
                     <main className="govuk-main-wrapper govuk-!-padding-top-9 govuk-!-padding-bottom-9">
                         <div className="govuk-grid-row">
                             <div className="govuk-grid-column-two-thirds ">
-                                <h1>Error</h1>
+                                <h1>{t("common:error-page-title")}</h1>
                                 <p className="govuk-body">
                                     {statusCode
                                         ? `An error ${statusCode} occurred on server`
-                                        : "An error occurred on the client"}
+                                        : t("common:error-page-message")}
                                 </p>
                                 <Link href="/">
                                     <a>Go back home</a>
@@ -45,6 +45,7 @@ function Error({ statusCode }, props) {
 
 Error.getInitialProps = ({ res, err }) => {
     const statusCode = res ? res.statusCode : err ? err.statusCode : 404;
+    console.log(res, err);
     return { statusCode };
 };