From 904187eb5a7e6d983dbd327acffd99a6721d15b4 Mon Sep 17 00:00:00 2001
From: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Date: Tue, 30 Mar 2021 11:54:31 -0700
Subject: [PATCH] Edit org UI text (#32455)

* Update NewOrgPage.tsx

* Update SelectOrgPage.tsx

* Update UserInviteForm.tsx

* Update UserInvitePage.tsx
---
 public/app/features/org/NewOrgPage.tsx     | 10 +++++-----
 public/app/features/org/SelectOrgPage.tsx  |  4 ++--
 public/app/features/org/UserInviteForm.tsx |  6 +++---
 public/app/features/org/UserInvitePage.tsx |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/app/features/org/NewOrgPage.tsx b/public/app/features/org/NewOrgPage.tsx
index 915a295f3e5..4b8b6597421 100644
--- a/public/app/features/org/NewOrgPage.tsx
+++ b/public/app/features/org/NewOrgPage.tsx
@@ -41,12 +41,12 @@ export const NewOrgPage: FC<PropsWithState> = ({ navModel }) => {
   return (
     <Page navModel={navModel}>
       <Page.Contents>
-        <h3 className="page-sub-heading">New Organization</h3>
+        <h3 className="page-sub-heading">New organization</h3>
 
         <p className="playlist-description">
-          Each organization contains their own dashboards, data sources and configuration, and cannot be shared between
-          orgs. While users may belong to more than one, multiple organization are most frequently used in multi-tenant
-          deployments.{' '}
+          Each organization contains their own dashboards, data sources, and configuration, which cannot be shared
+          shared between organizations. While users might belong to more than one organization, multiple organizations
+          are most frequently used in multi-tenant deployments.{' '}
         </p>
 
         <Form<CreateOrgFormDTO> onSubmit={createOrg}>
@@ -55,7 +55,7 @@ export const NewOrgPage: FC<PropsWithState> = ({ navModel }) => {
               <>
                 <Field label="Organization name" invalid={!!errors.name} error={errors.name && errors.name.message}>
                   <Input
-                    placeholder="Org. name"
+                    placeholder="Org name"
                     name="name"
                     ref={register({
                       required: 'Organization name is required',
diff --git a/public/app/features/org/SelectOrgPage.tsx b/public/app/features/org/SelectOrgPage.tsx
index d56e5f7c9c1..3dc079acbd2 100644
--- a/public/app/features/org/SelectOrgPage.tsx
+++ b/public/app/features/org/SelectOrgPage.tsx
@@ -38,8 +38,8 @@ export const SelectOrgPage: FC = () => {
       <Page.Contents>
         <div>
           <p>
-            You have been added to another Organization due to an open invitation! Please select which organization you
-            want to use right now (you can change this later at any time).
+            You have been invited to another organization! Please select which organization that you want to use right
+            now. You can change this later at any time.
           </p>
           <HorizontalGroup wrap>
             {orgs &&
diff --git a/public/app/features/org/UserInviteForm.tsx b/public/app/features/org/UserInviteForm.tsx
index 37812707aca..201ef1ddfed 100644
--- a/public/app/features/org/UserInviteForm.tsx
+++ b/public/app/features/org/UserInviteForm.tsx
@@ -37,7 +37,7 @@ export const UserInviteForm: FC<Props> = ({}) => {
     try {
       await getBackendSrv().post('/api/org/invites', formData);
     } catch (err) {
-      appEvents.emit(AppEvents.alertError, ['Failed to send invite', err.message]);
+      appEvents.emit(AppEvents.alertError, ['Failed to send invitation.', err.message]);
     }
     locationService.push('/org/users/');
   };
@@ -56,8 +56,8 @@ export const UserInviteForm: FC<Props> = ({}) => {
           <>
             <Field
               invalid={!!errors.loginOrEmail}
-              error={!!errors.loginOrEmail ? 'Email or Username is required' : undefined}
-              label="Email or Username"
+              error={!!errors.loginOrEmail ? 'Email or username is required' : undefined}
+              label="Email or username"
             >
               <Input name="loginOrEmail" placeholder="email@example.com" ref={register({ required: true })} />
             </Field>
diff --git a/public/app/features/org/UserInvitePage.tsx b/public/app/features/org/UserInvitePage.tsx
index 535dbeca7ba..33a0ce3a69a 100644
--- a/public/app/features/org/UserInvitePage.tsx
+++ b/public/app/features/org/UserInvitePage.tsx
@@ -15,9 +15,9 @@ export const UserInvitePage: FC<Props> = ({ navModel }) => {
   return (
     <Page navModel={navModel}>
       <Page.Contents>
-        <h3 className="page-sub-heading">Invite User</h3>
+        <h3 className="page-sub-heading">Invite user</h3>
         <div className="p-b-2">
-          Send invite or add existing Grafana user to the organization
+          Send invitation or add existing Grafana user to the organization.
           <span className="highlight-word"> {contextSrv.user.orgName}</span>
         </div>
         <UserInviteForm />