From c3c1de09ab64e80acde2a2b1d41580da25b36da4 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Mon, 24 Oct 2022 18:01:27 -0400
Subject: [PATCH] Settings

---
 app/scenes/Settings/Preferences.tsx        | 8 ++++++++
 app/scenes/Settings/Profile.tsx            | 8 ++++++--
 shared/i18n/locales/en_US/translation.json | 5 ++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/scenes/Settings/Preferences.tsx b/app/scenes/Settings/Preferences.tsx
index 38bdc9451..5aeaf7c1a 100644
--- a/app/scenes/Settings/Preferences.tsx
+++ b/app/scenes/Settings/Preferences.tsx
@@ -9,6 +9,7 @@ import Heading from "~/components/Heading";
 import InputSelect from "~/components/InputSelect";
 import Scene from "~/components/Scene";
 import Switch from "~/components/Switch";
+import Text from "~/components/Text";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
 import useToasts from "~/hooks/useToasts";
@@ -55,7 +56,11 @@ function Preferences() {
       icon={<SettingsIcon color="currentColor" />}
     >
       <Heading>{t("Preferences")}</Heading>
+      <Text type="secondary">
+        <Trans>Manage settings that affect your personal experience.</Trans>
+      </Text>
 
+      <Heading as="h2">{t("Display")}</Heading>
       <SettingRow
         label={t("Language")}
         name="language"
@@ -102,6 +107,7 @@ function Preferences() {
         name="codeBlockLineNumbers"
         label={t("Show line numbers")}
         description={t("Show line numbers on code blocks in documents.")}
+        border={false}
       >
         <Switch
           id="codeBlockLineNumbers"
@@ -110,6 +116,8 @@ function Preferences() {
           onChange={handlePreferenceChange}
         />
       </SettingRow>
+
+      <Heading as="h2">{t("Behavior")}</Heading>
       <SettingRow
         border={false}
         name="rememberLastPath"
diff --git a/app/scenes/Settings/Profile.tsx b/app/scenes/Settings/Profile.tsx
index 8fdceb971..2bd29a1ed 100644
--- a/app/scenes/Settings/Profile.tsx
+++ b/app/scenes/Settings/Profile.tsx
@@ -1,11 +1,12 @@
 import { observer } from "mobx-react";
 import { ProfileIcon } from "outline-icons";
 import * as React from "react";
-import { useTranslation } from "react-i18next";
+import { Trans, useTranslation } from "react-i18next";
 import Button from "~/components/Button";
 import Heading from "~/components/Heading";
 import Input from "~/components/Input";
 import Scene from "~/components/Scene";
+import Text from "~/components/Text";
 import useCurrentUser from "~/hooks/useCurrentUser";
 import useStores from "~/hooks/useStores";
 import useToasts from "~/hooks/useToasts";
@@ -65,6 +66,9 @@ const Profile = () => {
   return (
     <Scene title={t("Profile")} icon={<ProfileIcon color="currentColor" />}>
       <Heading>{t("Profile")}</Heading>
+      <Text type="secondary">
+        <Trans>Manage how you appear to other members of the workspace.</Trans>
+      </Text>
 
       <form onSubmit={handleSubmit} ref={form}>
         <SettingRow
@@ -80,7 +84,7 @@ const Profile = () => {
         </SettingRow>
         <SettingRow
           border={false}
-          label={t("Full name")}
+          label={t("Name")}
           name="name"
           description={t(
             "This could be your real name, or a nickname — however you’d like people to refer to you."
diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json
index 88288a226..69e5c1117 100644
--- a/shared/i18n/locales/en_US/translation.json
+++ b/shared/i18n/locales/en_US/translation.json
@@ -697,18 +697,22 @@
   "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.",
   "Preferences saved": "Preferences saved",
   "Delete account": "Delete account",
+  "Manage settings that affect your personal experience.": "Manage settings that affect your personal experience.",
+  "Display": "Display",
   "Language": "Language",
   "Choose the interface language. Community translations are accepted though our <2>translation portal</2>.": "Choose the interface language. Community translations are accepted though our <2>translation portal</2>.",
   "Use pointer cursor": "Use pointer cursor",
   "Show a hand cursor when hovering over interactive elements.": "Show a hand cursor when hovering over interactive elements.",
   "Show line numbers": "Show line numbers",
   "Show line numbers on code blocks in documents.": "Show line numbers on code blocks in documents.",
+  "Behavior": "Behavior",
   "Remember previous location": "Remember previous location",
   "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.",
   "You may delete your account at any time, note that this is unrecoverable": "You may delete your account at any time, note that this is unrecoverable",
   "Profile saved": "Profile saved",
   "Profile picture updated": "Profile picture updated",
   "Unable to upload new profile picture": "Unable to upload new profile picture",
+  "Manage how you appear to other members of the workspace.": "Manage how you appear to other members of the workspace.",
   "Photo": "Photo",
   "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.",
   "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.",
@@ -725,7 +729,6 @@
   "Require members to be invited to the workspace before they can create an account using SSO.": "Require members to be invited to the workspace before they can create an account using SSO.",
   "Default role": "Default role",
   "The default user role for new accounts. Changing this setting does not affect existing user accounts.": "The default user role for new accounts. Changing this setting does not affect existing user accounts.",
-  "Behavior": "Behavior",
   "When enabled, documents can be shared publicly on the internet by any member of the workspace": "When enabled, documents can be shared publicly on the internet by any member of the workspace",
   "Rich service embeds": "Rich service embeds",
   "Links to supported services are shown as rich embeds within your documents": "Links to supported services are shown as rich embeds within your documents",