From e0f053113a8cde97205f442a0698df7486192cd5 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 22 Sep 2020 17:42:47 -0400
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20move=20account-relat?=
 =?UTF-8?q?ed=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/form/account/password/index.hbs   |  2 +-
 .../scope/auth-methods/auth-method/accounts.js   |  2 +-
 .../auth-methods/auth-method/-navigation.hbs     |  4 ++--
 .../scope/auth-methods/auth-method/accounts.hbs  |  2 +-
 .../auth-method/accounts/account/-header.hbs     |  2 +-
 .../accounts/account/set-password/-header.hbs    |  4 ++--
 .../auth-methods/auth-method/accounts/index.hbs  |  6 +++---
 ui/core/translations/en-us.yaml                  |  8 --------
 ui/core/translations/resources/en-us.yaml        | 16 ++++++++++++----
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/ui/core/app/components/form/account/password/index.hbs b/ui/core/app/components/form/account/password/index.hbs
index 391a524d5..492e1c658 100644
--- a/ui/core/app/components/form/account/password/index.hbs
+++ b/ui/core/app/components/form/account/password/index.hbs
@@ -6,7 +6,7 @@
   as |form|
 >
   <form.input
-  @value={{t (concat 'account.types.' @model.type)}}
+  @value={{t (concat 'resources.account.types.' @model.type)}}
   @label={{t "form.type.label"}}
   readonly={{true}}
   @disabled={{true}} />
diff --git a/ui/core/app/controllers/scopes/scope/auth-methods/auth-method/accounts.js b/ui/core/app/controllers/scopes/scope/auth-methods/auth-method/accounts.js
index a922414ef..b6b542aa6 100644
--- a/ui/core/app/controllers/scopes/scope/auth-methods/auth-method/accounts.js
+++ b/ui/core/app/controllers/scopes/scope/auth-methods/auth-method/accounts.js
@@ -13,6 +13,6 @@ export default class ScopesScopeAuthMethodsAuthMethodAccountsController extends
    * @type {string}
    */
   get breadCrumb() {
-    return this.intl.t('resources.accounts');
+    return this.intl.t('resources.account.title_plural');
   }
 }
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
index 1c3f4d037..8862d9b4b 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs
@@ -3,6 +3,6 @@
     {{t 'titles.details'}}
   </nav.link>
   <nav.link @route='scopes.scope.auth-methods.auth-method.accounts'>
-    {{t 'titles.accounts'}}
+    {{t 'resources.account.title_plural'}}
   </nav.link>
-</Rose::Nav::Tabs>
\ No newline at end of file
+</Rose::Nav::Tabs>
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs
index 54c6c65e5..fe5b0c9ee 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs
@@ -1,3 +1,3 @@
-{{title (t 'titles.accounts')}}
+{{title (t 'resources.account.title_plural')}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
index 6d2a01ffa..834543f64 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs
@@ -1 +1 @@
-<h2>{{t "resources.account"}}</h2>
+<h2>{{t "resources.account.title"}}</h2>
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
index 2a5ff843c..53aaf93f6 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs
@@ -1,2 +1,2 @@
-<h2>{{t "resources.account"}}</h2>
-<p>{{t 'descriptions.account-set-password'}}</p>
+<h2>{{t "resources.account.title"}}</h2>
+<p>{{t 'resources.account.messages.set-password.description'}}</p>
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
index a1af0308d..81b93da9c 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs
@@ -34,11 +34,11 @@
 {{else}}
 
   <Rose::Layout::Centered>
-    <Rose::Message @title={{t "titles.accounts-welcome"}} as |message|>
+    <Rose::Message @title={{t "resources.account.messages.welcome.title"}} as |message|>
       <message.description>
-        {{t "descriptions.accounts-welcome"}}
+        {{t "resources.account.messages.welcome.description"}}
       </message.description>
     </Rose::Message>
   </Rose::Layout::Centered>
 
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml
index 2f30bf22e..864b61001 100644
--- a/ui/core/translations/en-us.yaml
+++ b/ui/core/translations/en-us.yaml
@@ -18,9 +18,6 @@ target:
 host:
   types:
     static: Static
-account:
-  types:
-    password: Password
 titles:
   iam: IAM
   new: New
@@ -55,9 +52,6 @@ titles:
   members: Members
   group-members-welcome: Welcome to Members
   no-available-users: No Users Available
-  accounts: Accounts
-  account: Account
-  accounts-welcome: Welcome to Accounts
   no-sessions: No Active Sessions
   actions: Actions
 descriptions:
@@ -80,6 +74,4 @@ descriptions:
   no-principals-available: Principals are not available for assignment.
   group-members-welcome: Users belonging to this group appear here.
   no-available-users: No users are available to add to this group.
-  account-set-password: Set a password for the account.
-  accounts-welcome: No accounts are available in this auth method.
   no-sessions: There are no active sessions at this time.
diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml
index da3e77a86..6e50a8523 100644
--- a/ui/core/translations/resources/en-us.yaml
+++ b/ui/core/translations/resources/en-us.yaml
@@ -1,3 +1,15 @@
+account:
+  title: Account
+  title_plural: Accounts
+  description: Accounts associate an IAM user with an auth method
+  messages:
+    welcome:
+      title: Welcome to Accounts
+      description: Create and manage accounts for an auth method.
+    set-password:
+      description: Set a password for the account.
+  types:
+    password: Password
 user: User
 users: Users
 role: Role
@@ -18,8 +30,6 @@ host: Host
 hosts: Hosts
 target: Target
 targets: Targets
-accounts: Accounts
-account: Account
 sessions: Sessions
 session: Session
 descriptions:
@@ -45,7 +55,5 @@ descriptions:
   hosts: A host is a computing element with a network address reachable from Boundary. A Host belongs to one and only one Host Catalog. A Host can be contained by zero or more Host Sets. The lifecycle of a Host is not tied to the lifecycle of any Host Sets.
   target: Target is abstract. A Target is deleted when the Scope it belongs to is deleted.
   targets: A target is a networked service a User can connect to and interact with through Boundary. A Target does not directly contain any secrets. A Target contains a collection of Hosts. A Target belongs to one and only one Scope. A Target can contain zero or more Host Sets. The lifecycle of a Target is not tied to the lifecycle of any Host Set.
-  accounts: Accounts
-  account: Account
   sessions: Sessions
   session: Session