From 4d30cc9e7e90abbbfeab9b863d7423a637bd132c Mon Sep 17 00:00:00 2001
From: DaneEveritt <dane@daneeveritt.com>
Date: Sat, 11 Jun 2022 14:52:41 -0400
Subject: [PATCH] Add translation values to activity log output

---
 resources/lang/en/activity.php                     |  4 ++--
 .../dashboard/activity/ActivityLogContainer.tsx    |  7 +++++++
 .../scripts/components/elements/Translate.tsx      | 14 ++++++++++++++
 resources/scripts/i18n.ts                          |  5 ++---
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 resources/scripts/components/elements/Translate.tsx

diff --git a/resources/lang/en/activity.php b/resources/lang/en/activity.php
index 352758c5e..f3e37bb78 100644
--- a/resources/lang/en/activity.php
+++ b/resources/lang/en/activity.php
@@ -26,8 +26,8 @@ return [
             'delete' => 'Deleted API key <strong>:identifier</strong>',
         ],
         'ssh-key' => [
-            'create' => 'Added SSH key (<strong>:fingerprint</strong>) to account',
-            'delete' => 'Removed SSH key (<strong>:fingerprint</strong>) from account',
+            'create' => 'Added SSH key <strong>:fingerprint</strong> to account',
+            'delete' => 'Removed SSH key <strong>:fingerprint</strong> from account',
         ],
         'two-factor' => [
             'create' => 'Enabled two-factor authentication for account',
diff --git a/resources/scripts/components/dashboard/activity/ActivityLogContainer.tsx b/resources/scripts/components/dashboard/activity/ActivityLogContainer.tsx
index 446490cd8..1e061125c 100644
--- a/resources/scripts/components/dashboard/activity/ActivityLogContainer.tsx
+++ b/resources/scripts/components/dashboard/activity/ActivityLogContainer.tsx
@@ -13,9 +13,11 @@ import { useLocation } from 'react-router';
 import Spinner from '@/components/elements/Spinner';
 import { styles as btnStyles } from '@/components/elements/button/index';
 import classNames from 'classnames';
+import Translate from '@/components/elements/Translate';
 
 export default () => {
     const location = useLocation();
+
     const { clearAndAddHttpError } = useFlashKey('account');
     const [ filters, setFilters ] = useState<ActivityLogFilters>({ page: 1, sorts: { timestamp: -1 } });
     const { data, isValidating, error } = useActivityLogs(filters, {
@@ -90,6 +92,11 @@ export default () => {
                                         </Tooltip>
                                     }
                                 </div>
+                                <p className={'mt-1 text-sm'}>
+                                    <Translate ns={'activity'} values={activity.properties}>
+                                        {activity.event.replace(':', '.')}
+                                    </Translate>
+                                </p>
                                 <div className={'mt-1 flex items-center text-sm'}>
                                     <Link
                                         to={`?${queryTo({ ip: activity.ip })}`}
diff --git a/resources/scripts/components/elements/Translate.tsx b/resources/scripts/components/elements/Translate.tsx
new file mode 100644
index 000000000..88dd1eab6
--- /dev/null
+++ b/resources/scripts/components/elements/Translate.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { Trans, TransProps, useTranslation } from 'react-i18next';
+
+type Props = Omit<TransProps, 't'>;
+
+export default ({ ns, children, ...props }: Props) => {
+    const { t } = useTranslation(ns);
+
+    return (
+        <Trans t={t} {...props}>
+            {children}
+        </Trans>
+    );
+};
diff --git a/resources/scripts/i18n.ts b/resources/scripts/i18n.ts
index 4f68c6175..cc527d5ae 100644
--- a/resources/scripts/i18n.ts
+++ b/resources/scripts/i18n.ts
@@ -19,7 +19,8 @@ i18n
         backend: {
             backend: I18NextHttpBackend,
             backendOption: {
-                loadPath: `/locales/locale.json?locale={{lng}}&namespace={{ns}}&hash=${hash}`,
+                loadPath: '/locales/locale.json?locale={{lng}}&namespace={{ns}}',
+                queryStringParams: { hash },
                 allowMultiLoading: true,
             } as BackendOptions,
         } as Record<string, any>,
@@ -30,6 +31,4 @@ i18n
         },
     });
 
-i18n.loadNamespaces([ 'validation' ]).catch(console.error);
-
 export default i18n;