Merge branch 'main' into fix/fix-badges-spacing-componentize

[lemmy-ui.git] / src / shared / components / app / error-page.tsx

diff --git a/src/shared/components/app/error-page.tsx b/src/shared/components/app/error-page.tsx
index 243a4a4ff021aa1d1fd9812629ae34568f981511..e083276e07fcf3eeac97a28f6cf3b53bc3255a16 100644 (file)
--- a/src/shared/components/app/error-page.tsx
+++ b/src/shared/components/app/error-page.tsx
@@ -1,9 +1,10 @@
+import { setIsoData } from "@utils/app";
+import { removeAuthParam } from "@utils/helpers";
 import { Component } from "inferno";
 import { T } from "inferno-i18next-dess";
 import { Link } from "inferno-router";
-import { i18n } from "../../i18next";
 import { IsoDataOptionalSite } from "../../interfaces";
-import { setIsoData } from "../../utils";
+import { I18NextService } from "../../services";
 
 export class ErrorPage extends Component<any, any> {
   private isoData: IsoDataOptionalSite = setIsoData(this.context);
@@ -16,32 +17,30 @@ export class ErrorPage extends Component<any, any> {
     const { errorPageData } = this.isoData;
 
     return (
-      <div className="container-lg text-center">
+      <div className="error-page container-lg text-center">
         <h1>
           {errorPageData
-            ? i18n.t("error_page_title")
-            : i18n.t("not_found_page_title")}
+            ? I18NextService.i18n.t("error_page_title")
+            : I18NextService.i18n.t("not_found_page_title")}
         </h1>
-        <p className="p-4">
-          {errorPageData ? (
-            <T i18nKey="error_page_paragraph" class="d-inline">
-              #<a href="https://lemmy.ml/c/lemmy_support">#</a>#
-              <a href="https://matrix.to/#/#lemmy-space:matrix.org">#</a>#
-            </T>
-          ) : (
-            i18n.t("not_found_page_message")
-          )}
-        </p>
+        {errorPageData ? (
+          <T i18nKey="error_page_paragraph" className="p-4" parent="p">
+            #<a href="https://lemmy.ml/c/lemmy_support">#</a>#
+            <a href="https://matrix.to/#/#lemmy-space:matrix.org">#</a>#
+          </T>
+        ) : (
+          <p>{I18NextService.i18n.t("not_found_page_message")}</p>
+        )}
         {!errorPageData && (
           <Link to="/" replace>
-            {i18n.t("not_found_return_home_button")}
+            {I18NextService.i18n.t("not_found_return_home_button")}
           </Link>
         )}
         {errorPageData?.adminMatrixIds &&
           errorPageData.adminMatrixIds.length > 0 && (
             <>
               <div>
-                {i18n.t("error_page_admin_matrix", {
+                {I18NextService.i18n.t("error_page_admin_matrix", {
                   instance:
                     this.isoData.site_res?.site_view.site.name ??
                     "this instance",
@@ -57,12 +56,13 @@ export class ErrorPage extends Component<any, any> {
             </>
           )}
         {errorPageData?.error && (
-          <code
-            style={{ "text-align": "start" }}
-            className="d-block bg-dark text-light p-2 mt-4"
+          <T
+            i18nKey="error_code_message"
+            parent="p"
+            interpolation={{ error: removeAuthParam(errorPageData.error) }}
           >
-            {errorPageData.error}
-          </code>
+            #<strong className="text-danger">#</strong>#
+          </T>
         )}
       </div>
     );