refactor: Update role, grants, & permissions translations

ui/core/app/components/form/role/add-principals/index.hbs

@@ -31,7 +31,7 @@
             </row.cell>
             <row.cell>{{principal.name}}</row.cell>
             <row.cell>
-              <Rose::Badge>{{t (concat 'resources.' principal.constructor.modelName)}}</Rose::Badge>
+              <Rose::Badge>{{t (concat 'resources.role.principal.types.' principal.constructor.modelName)}}</Rose::Badge>
             </row.cell>
           </body.row>
         {{/each}}
@@ -43,9 +43,9 @@
 
 {{#unless this.hasAvailablePrincipals}}
   <Rose::Layout::Centered>
-    <Rose::Message @title={{t "titles.no-principals-available"}} as |message|>
+    <Rose::Message @title={{t "resources.role.principal.messages.none.title"}} as |message|>
       <message.description>
-        {{t "descriptions.no-principals-available"}}
+        {{t "resources.role.principal.messages.none.description"}}
       </message.description>
       <message.link @route="scopes.scope.roles.role.principals">
         <Rose::Icon @name="chevron-left" />

ui/core/app/components/form/role/grants/index.hbs

@@ -14,7 +14,7 @@
         @value={{this.newGrantString}}
       as |input|>
         <item.key>
-          <input.label>{{t "titles.new-grant"}}</input.label>
+          <input.label>{{t "resources.role.grant.actions.create"}}</input.label>
         </item.key>
         <item.cell>
           <input.field title={{t "form.grant.help"}} />

ui/core/app/controllers/scopes/scope/roles.js

@@ -13,6 +13,6 @@ export default class ScopesScopeRolesController extends Controller {
    * @type {string}
    */
   get breadCrumb() {
-    return this.intl.t('resources.roles');
+    return this.intl.t('resources.role.title_plural');
   }
 }

ui/core/app/controllers/scopes/scope/roles/role/add-principals.js

@@ -13,6 +13,6 @@ export default class ScopesScopeRolesRoleAddPrincipalsController extends Control
    * @type {string}
    */
   get breadCrumb() {
-    return this.intl.t('actions.add-principals');
+    return this.intl.t('resources.role.principal.actions.add-principals');
   }
 }

ui/core/app/templates/scopes/scope.hbs

@@ -17,7 +17,7 @@
           {{t "resources.group.title_plural"}}
         </nav.link>
         <nav.link @route="scopes.scope.roles">
-          {{t "resources.roles"}}
+          {{t "resources.role.title_plural"}}
         </nav.link>
         <nav.link @route="scopes.scope.auth-methods">
           {{t "resources.auth-method.title_plural"}}

ui/core/app/templates/scopes/scope/roles.hbs

@@ -1,3 +1,3 @@
-{{title (t "resources.roles")}}
+{{title (t "resources.role.title_plural")}}
 
 {{outlet}}

ui/core/app/templates/scopes/scope/roles/index.hbs

@@ -5,8 +5,10 @@
   </page.breadcrumbs>
 
   <page.header>
-    <h2>{{t "resources.roles"}}</h2>
-    <p>{{t "resources.descriptions.roles"}}</p>
+    <h2>{{t "resources.role.title_plural"}}</h2>
+    {{#if @model}}
+      <p>{{t "resources.role.description"}}</p>
+    {{/if}}
   </page.header>
 
   <page.actions>
@@ -49,9 +51,9 @@
     {{else}}
 
       <Rose::Layout::Centered>
-        <Rose::Message @title={{t 'titles.roles-welcome'}} as |message|>
+        <Rose::Message @title={{t 'resources.role.messages.welcome.title'}} as |message|>
           <message.description>
-            {{t 'descriptions.roles-welcome'}}
+            {{t 'resources.role.description'}}
           </message.description>
           <message.link @route="scopes.scope.roles.new">
             <Rose::Icon @name="plus-circle-outline" />

ui/core/app/templates/scopes/scope/roles/role/-actions.hbs

@@ -1,12 +1,12 @@
 <Rose::Dropdown @text="{{t 'actions.manage'}}" @dropdownRight={{true}} as |dropdown|>
   <dropdown.link @route="scopes.scope.roles.role.add-principals">
-    {{t 'actions.add-principals'}}
+    {{t 'resources.role.principal.actions.add-principals'}}
   </dropdown.link>
   <dropdown.button
     @style="danger"
     @disabled={{@model.canSave}}
     {{on "click" (route-action "delete" @model)}}
   >
-    {{t 'actions.delete-role'}}
+    {{t 'resources.role.actions.delete'}}
   </dropdown.button>
 </Rose::Dropdown>

ui/core/app/templates/scopes/scope/roles/role/-header.hbs

@@ -1,2 +1,2 @@
-<h2>{{t "resources.role"}}</h2>
-<p>{{t "resources.descriptions.role"}}</p>
+<h2>{{t "resources.role.title"}}</h2>
+<p>{{t "resources.role.description"}}</p>

ui/core/app/templates/scopes/scope/roles/role/-navigation.hbs

@@ -3,9 +3,9 @@
     {{t 'titles.settings'}}
   </nav.link>
   <nav.link @route='scopes.scope.roles.role.principals'>
-    {{t 'titles.principals'}}
+    {{t 'resources.role.principal.title_plural'}}
   </nav.link>
   <nav.link @route='scopes.scope.roles.role.grants'>
-    {{t 'titles.grants'}}
+    {{t 'resources.role.grant.title_plural'}}
   </nav.link>
 </Rose::Nav::Tabs>

ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs

@@ -1,4 +1,4 @@
-{{title (t "actions.add-principals")}}
+{{title (t "resources.role.principal.actions.add-principals")}}
 
 <Form::Role::AddPrincipals
   @model={{@model.role}}

ui/core/app/templates/scopes/scope/roles/role/add-principals/-header.hbs

@@ -1 +1,2 @@
-<h2>{{t "actions.add-principals"}}</h2>
+<h2>{{t "resources.role.principal.messages.add-principals.title"}}</h2>
+<p>{{t "resources.role.principal.messages.add-principals.description"}}</p>

ui/core/app/templates/scopes/scope/roles/role/grants.hbs

@@ -1,4 +1,4 @@
-{{title (t 'titles.grants')}}
+{{title (t 'resources.role.grant.title_plural')}}
 
 <Form::Role::Grants
   @model={{@model}}

ui/core/app/templates/scopes/scope/roles/role/grants/-header.hbs

@@ -1,2 +1,2 @@
-<h2>{{t "resources.role"}}</h2>
-<p>{{t "resources.descriptions.grants"}}</p>
+<h2>{{t "resources.role.title"}}</h2>
+<p>{{t "resources.role.grant.description"}}</p>

ui/core/app/templates/scopes/scope/roles/role/principals.hbs

@@ -1,4 +1,4 @@
-{{title (t 'titles.principals')}}
+{{title (t 'resources.role.principal.title_plural')}}
 
 {{#if @model}}
 
@@ -18,7 +18,7 @@
             {{principal.model.displayName}}
           </row.headerCell>
           <row.cell>
-            {{t (concat 'resources.' principal.type)}}
+            {{t (concat 'resources.role.principal.types.' principal.type)}}
           </row.cell>
           <row.cell>
             <code>{{principal.model.id}}</code>
@@ -47,10 +47,14 @@
 {{else}}
 
   <Rose::Layout::Centered>
-    <Rose::Message @title={{t "titles.role-principals-welcome"}} as |message|>
+    <Rose::Message @title={{t "resources.role.principal.messages.welcome.title"}} as |message|>
       <message.description>
-        {{t "descriptions.role-principals-welcome"}}
+        {{t "resources.role.principal.messages.welcome.description"}}
       </message.description>
+      <message.link @route="scopes.scope.roles.role.add-principals">
+        <Rose::Icon @name="plus-circle-outline" />
+        {{t 'resources.role.principal.actions.add-principals'}}
+      </message.link>
     </Rose::Message>
   </Rose::Layout::Centered>
 

ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs

@@ -1,2 +1,2 @@
-<h2>{{t "resources.role"}}</h2>
-<p>{{t "resources.descriptions.principals"}}</p>
+<h2>{{t "resources.role.title"}}</h2>
+<p>{{t "resources.role.principal.description"}}</p>

ui/core/translations/en-us.yaml

@@ -25,31 +25,22 @@ titles:
   empty-set: No Items Yet
   host-sets-welcome: Welcome to Host Sets
   hosts-welcome: Welcome to Hosts
-  roles-welcome: Welcome to Roles
   targets-welcome: Create your first Target
   target-host-sets-welcome: No Host Sets Associated
-  grants: Permissions
-  new-grant: New Grant
-  principals: Principals
   host-sets: Host Sets
   hosts: Hosts
   targets: Targets
   global: Global
   no-host-set-hosts: No Hosts Available
   no-host-sets-for-target: No Host Sets Available
-  role-principals-welcome: No Principals Associated
-  no-principals-available: No Principals Available
   no-available-users: No Users Available
   actions: Actions
 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.
-  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.
   no-host-set-hosts: Before associating hosts with this host set, create hosts within the host catalog.
   no-host-sets-for-target: No host sets are available to add to this target.
-  role-principals-welcome: No principals are available in this role.
-  no-principals-available: Principals are not available for assignment.
   no-available-users: No users are available to add to this group.

ui/core/translations/resources/en-us.yaml

@@ -80,8 +80,41 @@ user:
   messages:
     welcome:
       title: Welcome to Users
-role: Role
-roles: Roles
+role:
+  title: Role
+  title_plural: Roles
+  description: Roles are collections of capability grants and the principals (users and groups) assigned to them.
+  messages:
+    welcome:
+      title: Welcome to Roles
+  actions:
+    create: Create Role
+    delete: Delete Role
+  principal:
+    title: Principal
+    title_plural: Principals
+    description: Principals are the users and groups assigned to a role and bounded by a role’s grants.
+    messages:
+      welcome:
+        title: Welcome to Principals
+        description: Principals are not assigned in this role.
+      none:
+        title: No Principals Available
+        description: Principals are not available for assignment.
+      add-principals:
+        title: Add Principals
+        description: Select users and groups to assign to this role.
+    types:
+      user: User
+      group: Group
+    actions:
+      add-principals: Add Principals
+  grant:
+    title: Grant
+    title_plural: Grants
+    description: Grants are permissions which allow roles to take actions and access resources
+    actions:
+      create: New Grant
 host-set: Host Set
 host-sets: Host Sets
 host: Host
@@ -89,10 +122,6 @@ hosts: Hosts
 target: Target
 targets: Targets
 descriptions:
-  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.
-  principals: A principal is any entity which can be assigned capabilities. Principal is abstract. User, Group, and Project are concrete Principals. A Principal can be assigned to zero or more Roles.
   host-set: Host Set is abstract. A Host Set is deleted when the Host Catalog it belongs to is deleted.
   host-sets: A host set is a resource which provides a subset of Hosts from the set of Hosts of the Host Catalog it belongs to. A Host Set belongs to one and only one Host Catalog. A Host Set can contain zero or more Hosts. A Host Set can be contained by zero or more Targets. The lifecycle of a Host Set is not tied to the lifecycle of any Targets or Hosts.
   host: Host is abstract. A Host is deleted when the Host Catalog it belongs to is deleted.