Merge branch 'master' into 5418_externalUser

alihadimazeh · Jun 17, 2024 · 70b361a · 70b361a
2 parents 9ece0e5 + e59ea4b
commit 70b361a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/assets/locales/en.json b/app/assets/locales/en.json
@@ -14,6 +14,7 @@
   "report": "Report",
   "share": "Share",
   "cancel": "Cancel",
+  "reset":   "Reset",
   "close": "Close",
   "delete": "Delete",
   "copy": "Copy Join Link",

diff --git a/app/javascript/components/users/user/forms/UpdateUserForm.jsx b/app/javascript/components/users/user/forms/UpdateUserForm.jsx
@@ -85,7 +85,7 @@ export default function UpdateUserForm({ user }) {
         </FormSelect>
       )}
       <Stack direction="horizontal" gap={2} className="float-end">
-        <Button variant="neutral" onClick={reset}> { t('cancel') } </Button>
+        <Button variant="neutral" onClick={reset}> { t('reset') } </Button>
         <Button variant="brand" type="submit" disabled={updateUserAPI.isLoading}>
           { t('update') }
           {updateUserAPI.isLoading && <Spinner className="me-2" />}