From 1c7dbb2a51ca869e1389832b11be3aab783e1fa8 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Fri, 25 Sep 2020 17:18:20 -0400
Subject: [PATCH] refactor: update user translations

---
 ui/core/app/controllers/scopes/scope/users.js         |  2 +-
 ui/core/app/templates/scopes/scope.hbs                |  2 +-
 ui/core/app/templates/scopes/scope/users.hbs          |  2 +-
 ui/core/app/templates/scopes/scope/users/index.hbs    | 10 ++++++----
 .../app/templates/scopes/scope/users/user/index.hbs   |  4 ++--
 ui/core/translations/en-us.yaml                       |  2 --
 ui/core/translations/resources/en-us.yaml             | 11 +++++++----
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ui/core/app/controllers/scopes/scope/users.js b/ui/core/app/controllers/scopes/scope/users.js
index c88b342fc..72e7bd537 100644
--- a/ui/core/app/controllers/scopes/scope/users.js
+++ b/ui/core/app/controllers/scopes/scope/users.js
@@ -13,6 +13,6 @@ export default class ScopesScopeUsersController extends Controller {
    * @type {string}
    */
   get breadCrumb() {
-    return this.intl.t('resources.users');
+    return this.intl.t('resources.user.title_plural');
   }
 }
diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs
index 1cf097811..5c94400c2 100644
--- a/ui/core/app/templates/scopes/scope.hbs
+++ b/ui/core/app/templates/scopes/scope.hbs
@@ -11,7 +11,7 @@
 
       <Rose::Nav::Sidebar @title={{t "titles.iam"}} as |nav|>
         <nav.link @route="scopes.scope.users">
-          {{t "resources.users"}}
+          {{t "resources.user.title_plural"}}
         </nav.link>
         <nav.link @route="scopes.scope.groups">
           {{t "resources.group.title_plural"}}
diff --git a/ui/core/app/templates/scopes/scope/users.hbs b/ui/core/app/templates/scopes/scope/users.hbs
index 67ccbeb9e..f6ecdfa99 100644
--- a/ui/core/app/templates/scopes/scope/users.hbs
+++ b/ui/core/app/templates/scopes/scope/users.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.users")}}
+{{title (t "resources.user.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs
index 8ecec771c..26458d273 100644
--- a/ui/core/app/templates/scopes/scope/users/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/index.hbs
@@ -5,8 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.users"}}</h2>
-    <p>{{t "resources.descriptions.users"}}</p>
+    <h2>{{t "resources.user.title_plural"}}</h2>
+    {{#if @model}}
+      <p>{{t "resources.user.description"}}</p>
+    {{/if}}
   </page.header>
 
   <page.actions>
@@ -49,9 +51,9 @@
     {{else}}
 
       <Rose::Layout::Centered>
-        <Rose::Message @title={{t 'titles.users-welcome'}} as |message|>
+        <Rose::Message @title={{t 'resources.user.messages.welcome.title'}} as |message|>
           <message.description>
-            {{t 'descriptions.users-welcome'}}
+            {{t 'resources.user.description'}}
           </message.description>
           <message.link @route="scopes.scope.users.new">
             <Rose::Icon @name="plus-circle-outline" />
diff --git a/ui/core/app/templates/scopes/scope/users/user/index.hbs b/ui/core/app/templates/scopes/scope/users/user/index.hbs
index a57e6f8eb..198efa389 100644
--- a/ui/core/app/templates/scopes/scope/users/user/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/index.hbs
@@ -5,8 +5,8 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.user"}}</h2>
-    <p>{{t "resources.descriptions.user"}}</p>
+    <h2>{{t "resources.user.title"}}</h2>
+    <p>{{t "resources.user.description"}}</p>
   </page.header>
 
   <page.actions>
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 500c14ff4..a158daeb8 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -25,7 +25,6 @@ titles:
   empty-set: No Items Yet
   host-sets-welcome: Welcome to Host Sets
   hosts-welcome: Welcome to Hosts
-  users-welcome: Welcome to Users
   roles-welcome: Welcome to Roles
   targets-welcome: Create your first Target
   target-host-sets-welcome: No Host Sets Associated
@@ -46,7 +45,6 @@ descriptions:
   empty-set: There are no items to display yet.  You may be able to add items or try back later.
   host-sets-welcome: Configure a static host set in this host catalog.
   hosts-welcome: Configure a static host in this host catalog.
-  users-welcome: Users are authorized to access Boundary.
   roles-welcome: Roles are collections of capabilities that can be granted to user and/or groups.
   targets-welcome: Targets provide Users the means to connect to and interact networked services. A Target contains a collection of Hosts and a collection of Credentials.
   target-host-sets-welcome: Add Host Sets to this target to provide access.
diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml
index 22c7be5aa..a0c4df6c7 100644
--- a/ui/core/translations/resources/en-us.yaml
+++ b/ui/core/translations/resources/en-us.yaml
@@ -73,8 +73,13 @@ project:
   messages:
     welcome:
       title: Welcome to Projects
-user: User
-users: Users
+user:
+  title: User
+  title_plural: Users
+  description: Users are entities authorized to access Boundary.  Users may be assigned to roles as principals, thus receiving role grants.
+  messages:
+    welcome:
+      title: Welcome to Users
 role: Role
 roles: Roles
 host-set: Host Set
@@ -84,8 +89,6 @@ hosts: Hosts
 target: Target
 targets: Targets
 descriptions:
-  user: A User inherits from Principal ("is-a" Principal) allowing it to be associated with zero or more Roles.
-  users: A user is any entity authorized to access Boundary using authentication credentials specific to one of the configured Authentication Methods. A User is owned by one and only one Organization. A User is associated with zero or one Authentication Methods. A User not associated with an Authentication Method can not log in to the system. A User can belong to zero or more Groups. A User is deleted when the Organization it belongs to is deleted. The lifecycle of a User is not tied to the lifecycle of any Authentication Method, Group or Role, but rather to its Organization only.
   role: A Role can be assigned to zero or more Principals. A Principal assigned a Role receives all capabilities granted by any Direct Grant owned by the Role. A Role is deleted when the Scope it belongs to is deleted. All Direct Grants owned by a Role are deleted when the Role is deleted.
   roles: A role is a collection of capabilities granted to any Principal the Role is assigned to. A Role belongs to one and only one Scope. A Role owns zero or more Direct Grants. The lifecycle of a Role is not tied to the lifecycle of any Principal.
   grants: A grant represents a set of capabilities granted to a role. It couples a set of Actions to either a set of Resource Types or an individual Resource. A Direct Grant belongs exclusively to one and only one Role. However, equivalent Direct Grants may exist across different Roles. A Direct Grant references one or more Actions and either one or more Resource types or one specific Resource. A Direct Grant is deleted when the Role it belongs to is deleted. A Direct Grant is also deleted if it is associated with a specific Resource and that Resource itself is deleted. The lifecycle of a Direct Grant is not tied to the lifecycle of any Action or Resource Type.