From e5027982efffb691a34c8076e5d9e9fb1603aa75 Mon Sep 17 00:00:00 2001
From: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Date: Mon, 29 Mar 2021 12:52:40 -0700
Subject: [PATCH] Edit admin UI text (#32454)

* Update AdminEditOrgPage.tsx

* Update AdminOrgsTable.tsx

* Update AdminSettings.tsx

* Update UserCreatePage.tsx

* Update UserLdapSyncInfo.tsx

* Update UserListAdminPage.tsx

* Update UserOrgs.tsx

* Update UserProfile.tsx

* Update UserSessions.tsx
---
 public/app/features/admin/AdminEditOrgPage.tsx  |  4 ++--
 public/app/features/admin/AdminOrgsTable.tsx    |  2 +-
 public/app/features/admin/AdminSettings.tsx     |  2 +-
 public/app/features/admin/UserCreatePage.tsx    |  2 +-
 public/app/features/admin/UserLdapSyncInfo.tsx  |  6 +++---
 public/app/features/admin/UserListAdminPage.tsx |  2 +-
 public/app/features/admin/UserOrgs.tsx          | 10 +++++-----
 public/app/features/admin/UserProfile.tsx       |  6 +++---
 public/app/features/admin/UserSessions.tsx      |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/public/app/features/admin/AdminEditOrgPage.tsx b/public/app/features/admin/AdminEditOrgPage.tsx
index ab22f9ad542..c25aa720fab 100644
--- a/public/app/features/admin/AdminEditOrgPage.tsx
+++ b/public/app/features/admin/AdminEditOrgPage.tsx
@@ -56,7 +56,7 @@ export const AdminEditOrgPage: FC<Props> = ({ match }) => {
     <Page navModel={navModel}>
       <Page.Contents>
         <>
-          <Legend>Edit Organization</Legend>
+          <Legend>Edit organization</Legend>
 
           {orgState.value && (
             <Form
@@ -79,7 +79,7 @@ export const AdminEditOrgPage: FC<Props> = ({ match }) => {
               margin-top: 20px;
             `}
           >
-            <Legend>Organization Users</Legend>
+            <Legend>Organization users</Legend>
             {!!users.length && (
               <UsersTable
                 users={users}
diff --git a/public/app/features/admin/AdminOrgsTable.tsx b/public/app/features/admin/AdminOrgsTable.tsx
index 604319175c5..e1deb92ac1e 100644
--- a/public/app/features/admin/AdminOrgsTable.tsx
+++ b/public/app/features/admin/AdminOrgsTable.tsx
@@ -13,7 +13,7 @@ export const AdminOrgsTable: FC<Props> = ({ orgs, onDelete }) => {
     <table className="filter-table form-inline filter-table--hover">
       <thead>
         <tr>
-          <th>Id</th>
+          <th>ID</th>
           <th>Name</th>
           <th style={{ width: '1%' }}></th>
         </tr>
diff --git a/public/app/features/admin/AdminSettings.tsx b/public/app/features/admin/AdminSettings.tsx
index 1b00b42e1bb..061ee0daf53 100644
--- a/public/app/features/admin/AdminSettings.tsx
+++ b/public/app/features/admin/AdminSettings.tsx
@@ -43,7 +43,7 @@ export class AdminSettings extends React.PureComponent<Props, State> {
         <Page.Contents isLoading={isLoading}>
           <div className="grafana-info-box span8" style={{ margin: '20px 0 25px 0' }}>
             These system settings are defined in grafana.ini or custom.ini (or overridden in ENV variables). To change
-            these you currently need to restart grafana.
+            these you currently need to restart Grafana.
           </div>
 
           <table className="filter-table">
diff --git a/public/app/features/admin/UserCreatePage.tsx b/public/app/features/admin/UserCreatePage.tsx
index d76ed84da26..3c41acf2a82 100644
--- a/public/app/features/admin/UserCreatePage.tsx
+++ b/public/app/features/admin/UserCreatePage.tsx
@@ -49,7 +49,7 @@ const UserCreatePage: React.FC<UserCreatePageProps> = ({ navModel }) => {
                   <Input name="name" ref={register({ required: true })} />
                 </Field>
 
-                <Field label="E-mail">
+                <Field label="Email">
                   <Input name="email" ref={register} />
                 </Field>
 
diff --git a/public/app/features/admin/UserLdapSyncInfo.tsx b/public/app/features/admin/UserLdapSyncInfo.tsx
index 3a853758ceb..1181551e9f0 100644
--- a/public/app/features/admin/UserLdapSyncInfo.tsx
+++ b/public/app/features/admin/UserLdapSyncInfo.tsx
@@ -34,7 +34,7 @@ export class UserLdapSyncInfo extends PureComponent<Props, State> {
               <tbody>
                 <tr>
                   <td>External sync</td>
-                  <td>User synced via LDAP – some changes must be done in LDAP or mappings.</td>
+                  <td>User synced via LDAP. Some changes must be done in LDAP or mappings.</td>
                   <td>
                     <span className="label label-tag">LDAP</span>
                   </td>
@@ -42,12 +42,12 @@ export class UserLdapSyncInfo extends PureComponent<Props, State> {
                 <tr>
                   {ldapSyncInfo.enabled ? (
                     <>
-                      <td>Next scheduled synchronisation</td>
+                      <td>Next scheduled synchronization</td>
                       <td colSpan={2}>{nextSyncTime}</td>
                     </>
                   ) : (
                     <>
-                      <td>Next scheduled synchronisation</td>
+                      <td>Next scheduled synchronization</td>
                       <td colSpan={2}>Not enabled</td>
                     </>
                   )}
diff --git a/public/app/features/admin/UserListAdminPage.tsx b/public/app/features/admin/UserListAdminPage.tsx
index 77e4885bcd4..aaf970ae1ed 100644
--- a/public/app/features/admin/UserListAdminPage.tsx
+++ b/public/app/features/admin/UserListAdminPage.tsx
@@ -46,7 +46,7 @@ const UserListAdminPageUnConnected: React.FC<Props> = (props) => {
               <Input
                 width={40}
                 type="text"
-                placeholder="Search user by login, email or name"
+                placeholder="Search user by login, email, or name."
                 tabIndex={1}
                 autoFocus={true}
                 value={query}
diff --git a/public/app/features/admin/UserOrgs.tsx b/public/app/features/admin/UserOrgs.tsx
index 73688d93d43..d5b100cc038 100644
--- a/public/app/features/admin/UserOrgs.tsx
+++ b/public/app/features/admin/UserOrgs.tsx
@@ -46,7 +46,7 @@ export class UserOrgs extends PureComponent<Props, State> {
 
     return (
       <>
-        <h3 className="page-heading">Organisations</h3>
+        <h3 className="page-heading">Organizations</h3>
         <div className="gf-form-group">
           <div className="gf-form">
             <table className="filter-table form-inline">
@@ -64,7 +64,7 @@ export class UserOrgs extends PureComponent<Props, State> {
           </div>
           <div className={addToOrgContainerClass}>
             <Button variant="secondary" onClick={this.showOrgAddModal(true)}>
-              Add user to organisation
+              Add user to organization
             </Button>
           </div>
           <AddToOrgModal isOpen={showAddOrgModal} onOrgAdd={onOrgAdd} onDismiss={this.showOrgAddModal(false)} />
@@ -162,7 +162,7 @@ class UnThemedOrgRow extends PureComponent<OrgRowProps, OrgRowState> {
               onCancel={this.onCancelClick}
               onConfirm={this.onOrgRemove}
             >
-              Remove from organisation
+              Remove from organization
             </ConfirmButton>
           </div>
         </td>
@@ -235,7 +235,7 @@ export class AddToOrgModal extends PureComponent<AddToOrgModalProps, AddToOrgMod
         isOpen={isOpen}
         onDismiss={this.onCancel}
       >
-        <Field label="Organisation">
+        <Field label="Organization">
           <OrgPicker onSelected={this.onOrgSelect} />
         </Field>
         <Field label="Role">
@@ -244,7 +244,7 @@ export class AddToOrgModal extends PureComponent<AddToOrgModalProps, AddToOrgMod
         <Container padding="md">
           <HorizontalGroup spacing="md" justify="center">
             <Button variant="primary" onClick={this.onAddUserToOrg}>
-              Add to organisation
+              Add to organization
             </Button>
             <Button variant="secondary" onClick={this.onCancel}>
               Cancel
diff --git a/public/app/features/admin/UserProfile.tsx b/public/app/features/admin/UserProfile.tsx
index 7d3046c5141..a3d895cf839 100644
--- a/public/app/features/admin/UserProfile.tsx
+++ b/public/app/features/admin/UserProfile.tsx
@@ -127,7 +127,7 @@ export class UserProfile extends PureComponent<Props, State> {
           </div>
           <div className={styles.buttonRow}>
             <Button variant="destructive" onClick={this.showDeleteUserModal(true)}>
-              Delete User
+              Delete user
             </Button>
             <ConfirmModal
               isOpen={showDeleteModal}
@@ -139,11 +139,11 @@ export class UserProfile extends PureComponent<Props, State> {
             />
             {user.isDisabled ? (
               <Button variant="secondary" onClick={this.onUserEnable}>
-                Enable User
+                Enable user
               </Button>
             ) : (
               <Button variant="secondary" onClick={this.showDisableUserModal(true)}>
-                Disable User
+                Disable user
               </Button>
             )}
             <ConfirmModal
diff --git a/public/app/features/admin/UserSessions.tsx b/public/app/features/admin/UserSessions.tsx
index 5b1950713a4..0eefbd9df02 100644
--- a/public/app/features/admin/UserSessions.tsx
+++ b/public/app/features/admin/UserSessions.tsx
@@ -53,7 +53,7 @@ export class UserSessions extends PureComponent<Props, State> {
                   <th>Last seen</th>
                   <th>Logged on</th>
                   <th>IP address</th>
-                  <th colSpan={2}>Browser &amp; OS</th>
+                  <th colSpan={2}>Browser and OS</th>
                 </tr>
               </thead>
               <tbody>