From 0241b8902de69aa2a0c572456fcd8f0d908fd9ef Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 22 Sep 2020 17:54:53 -0400 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20move=20auth=20method?= =?UTF-8?q?=20resource=20strings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controllers/scopes/scope/auth-methods.js | 2 +- ui/core/app/templates/scopes/scope.hbs | 2 +- .../scope/auth-methods/auth-method/-header.hbs | 4 ++-- .../templates/scopes/scope/auth-methods/index.hbs | 8 ++++---- .../app/templates/scopes/scope/authenticate.hbs | 4 ++-- .../templates/scopes/scope/authenticate/index.hbs | 4 ++-- ui/core/translations/en-us.yaml | 4 ---- ui/core/translations/resources/en-us.yaml | 15 +++++++++++---- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ui/core/app/controllers/scopes/scope/auth-methods.js b/ui/core/app/controllers/scopes/scope/auth-methods.js index ab152cf62..e84924fa3 100644 --- a/ui/core/app/controllers/scopes/scope/auth-methods.js +++ b/ui/core/app/controllers/scopes/scope/auth-methods.js @@ -13,6 +13,6 @@ export default class ScopesScopeAuthMethodsController extends Controller { * @type {string} */ get breadCrumb() { - return this.intl.t('resources.auth-methods'); + return this.intl.t('resources.auth-method.title_plural'); } } diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs index 5f60d2607..341b098f8 100644 --- a/ui/core/app/templates/scopes/scope.hbs +++ b/ui/core/app/templates/scopes/scope.hbs @@ -20,7 +20,7 @@ {{t "resources.roles"}} - {{t "resources.auth-methods"}} + {{t "resources.auth-method.title_plural"}} diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs index f83a85430..18be0b9ea 100644 --- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs +++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs @@ -1,2 +1,2 @@ -

{{t "resources.auth-method"}}

-

{{t "resources.descriptions.auth-method"}}

+

{{t "resources.auth-method.title"}}

+

{{t "resources.auth-method.description"}}

diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs index 90ac6b2bc..2acb8bfa1 100644 --- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs @@ -1,7 +1,7 @@ -

{{t "resources.auth-methods"}}

-

{{t "resources.descriptions.auth-methods"}}

+

{{t "resources.auth-method.title_plural"}}

+

{{t "resources.auth-method.description"}}

 @@ -56,9 +56,9 @@ {{else}} - + - {{t 'descriptions.auth-methods-welcome'}} + {{t 'resources.auth-method.messages.welcome.description'}} diff --git a/ui/core/app/templates/scopes/scope/authenticate.hbs b/ui/core/app/templates/scopes/scope/authenticate.hbs index 010282a00..05b901caa 100644 --- a/ui/core/app/templates/scopes/scope/authenticate.hbs +++ b/ui/core/app/templates/scopes/scope/authenticate.hbs @@ -39,11 +39,11 @@ {{#unless @model.authMethods}} - {{t "auth.descriptions.no-methods"}} + {{t "resources.auth-method.messages.none.description"}} diff --git a/ui/core/app/templates/scopes/scope/authenticate/index.hbs b/ui/core/app/templates/scopes/scope/authenticate/index.hbs index 22cc46f4e..effd53cbd 100644 --- a/ui/core/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/core/app/templates/scopes/scope/authenticate/index.hbs @@ -1,11 +1,11 @@ {{#unless @model}} - {{t "auth.descriptions.no-methods"}} + {{t "resources.auth-method.messages.none.description"}} diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index 864b61001..235645b72 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -1,10 +1,8 @@ auth: titles: no-scopes: No Scopes Available - no-methods: No Authentication Method descriptions: no-scopes: No scopes were found. To authenticate, ask your administrator to create an scope and grant you access. - no-methods: No authentication methods were found for this scope. Switch scopes and try again. choose-org: Choose a scope to authenticate. authenticating-with-org: "You're authenticating with {name}." method-types: @@ -35,7 +33,6 @@ titles: users-welcome: Welcome to Users roles-welcome: Welcome to Roles groups-welcome: Welcome to Groups - auth-methods-welcome: Welcome to Auth Methods targets-welcome: Create your first Target target-host-sets-welcome: No Host Sets Associated grants: Permissions @@ -65,7 +62,6 @@ descriptions: users-welcome: Users are authorized to access Boundary. roles-welcome: Roles are collections of capabilities that can be granted to user and/or groups. groups-welcome: Groups are collections of users. - auth-methods-welcome: Auth methods are configurations to authenticate users. 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. diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml index 6e50a8523..60a6e303d 100644 --- a/ui/core/translations/resources/en-us.yaml +++ b/ui/core/translations/resources/en-us.yaml @@ -10,6 +10,17 @@ account: description: Set a password for the account. types: password: Password +auth-method: + title: Auth Method + title_plural: Auth Methods + description: An authentication method is a method configured for an Organization to authenticate Users. An Authentication Method is owned by one and only one Organization. + messages: + welcome: + title: Welcome to Auth Methods + description: Auth methods are configurations to authenticate users. + none: + title: No Authentication Methods + description: No authentication methods were found for this scope. Switch scopes and try again. user: User users: Users role: Role @@ -22,8 +33,6 @@ projects: Projects project: Project host-catalog: Host Catalog host-catalogs: Host Catalogs -auth-method: Auth Method -auth-methods: Auth Methods host-set: Host Set host-sets: Host Sets host: Host @@ -47,8 +56,6 @@ descriptions: projects: A project is a child scope of an organization and is owned by an Organization. A Project inherits from Scope ("is-a" Scope) allowing it to own zero to many Groups, Roles, Targets, or Host Catalogs. A Project also inherits from Principal ("is-a" Principal) allowing it to be associated with zero or more Roles. A Project has no additional relationships beyond those defined in Scope and Principal. A Project is deleted when the Organization it belongs to is deleted. host-catalog: A host catalog is a permission boundary modeled as a container. host-catalogs: A host catalog is a permission boundary modeled as a container. - auth-method: An Authentication Method creates and references zero or more Users. An Authentication Method is deleted when the Organization it belongs to is deleted. The lifecycle of an Authentication Method is not tied to the lifecycle of any User. - auth-methods: An authentication method is a method configured for an Organization to authenticate Users. An Authentication Method is owned by one and only one Organization. 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.