Merge branch 'consolidate-translation' into feat-typed-host

ui/admin/app/components/form/host-catalog/aws/index.hbs

@@ -74,15 +74,13 @@
 
     <Rose::Separator />
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+      <:title>{{t 'form.provider.label'}}</:title>
     </form.fieldset>
 
     <form.fieldset>
-      <:title>{{t
-          'resources.host-catalog.form.provider.choose_a_provider.label'
-        }}</:title>
+      <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
       <:description>{{t
-          'resources.host-catalog.form.provider.choose_a_provider.description'
+          'form.provider.choose_a_provider.description'
         }}</:description>
 
       <:body>
@@ -109,10 +107,8 @@
     </form.fieldset>
   {{else}}
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
-      <:description>{{t
-          'resources.host-catalog.form.provider.description'
-        }}</:description>
+      <:title>{{t 'form.provider.label'}}</:title>
+      <:description>{{t 'form.provider.description'}}</:description>
       <:body>
         <form.radioGroup
           @name='provider'

ui/admin/app/components/form/host-catalog/azure/index.hbs

@@ -47,10 +47,6 @@
   </form.textarea>
 
   {{#if @model.isNew}}
-    {{!-- <form.label>{{t
-          'resources.host-catalog.form.provider.label'
-        }}</form.label> --}}
-
     <form.fieldset>
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
@@ -78,14 +74,12 @@
     <Rose::Separator />
 
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+      <:title>{{t 'form.provider.label'}}</:title>
     </form.fieldset>
     <form.fieldset>
-      <:title>{{t
-          'resources.host-catalog.form.provider.choose_a_provider.label'
-        }}</:title>
+      <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
       <:description>{{t
-          'resources.host-catalog.form.provider.choose_a_provider.description'
+          'form.provider.choose_a_provider.description'
         }}</:description>
 
       <:body>
@@ -113,10 +107,8 @@
   {{else}}
 
     <form.fieldset>
-      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
-      <:description>{{t
-          'resources.host-catalog.form.provider.description'
-        }}</:description>
+      <:title>{{t 'form.provider.label'}}</:title>
+      <:description>{{t 'form.provider.description'}}</:description>
 
       <:body>
         <form.radioGroup
@@ -162,9 +154,9 @@
     @name='client_id'
     @type='client_id'
     @value={{@model.client_id}}
-    @label={{t 'form.provider_client_id.label'}}
-    @helperText={{t 'form.provider_client_id.help'}}
-    @linkText={{t 'form.provider_client_id.link-text'}}
+    @label={{t 'form.provider.client.label'}}
+    @helperText={{t 'form.provider.client.help'}}
+    @linkText={{t 'form.provider.client.link-text'}}
     @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
     readonly={{false}}
   />

ui/admin/app/components/form/host-catalog/static/index.hbs

@@ -75,15 +75,13 @@
     {{#if @model.isPlugin}}
       <Rose::Separator />
       <form.fieldset>
-        <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+        <:title>{{t 'form.provider.label'}}</:title>
       </form.fieldset>
 
       <form.fieldset>
-        <:title>{{t
-            'resources.host-catalog.form.provider.choose_a_provider.label'
-          }}</:title>
+        <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
         <:description>{{t
-            'resources.host-catalog.form.provider.choose_a_provider.description'
+            'form.provider.choose_a_provider.description'
           }}</:description>
 
         <:body>

ui/admin/app/components/form/host-set/aws/index.hbs

@@ -78,8 +78,8 @@
 
   {{! placeholder for filter, update me when the model is ready }}
   <Rose::Form::Fieldset>
-    <:title>{{t 'form.provider_filter.label'}}</:title>
-    <:description>{{t 'form.provider_filter.help'}}</:description>
+    <:title>{{t 'form.provider.filter.label'}}</:title>
+    <:description>{{t 'form.provider.filter.help'}}</:description>
   </Rose::Form::Fieldset>
 
   {{#if (can 'save model' @model)}}

ui/admin/app/components/form/host-set/azure/index.hbs

@@ -80,9 +80,9 @@
   <form.textarea
     @name='filter'
     @type='filter'
-    @label={{t 'form.provider_filter.label'}}
-    @helperText={{t 'form.provider_filter.help'}}
-    @linkText={{t 'form.provider_filter.link-text'}}
+    @label={{t 'form.provider.filter.label'}}
+    @helperText={{t 'form.provider.filter.help'}}
+    @linkText={{t 'form.provider.filter.link-text'}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}

ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs

@@ -8,7 +8,9 @@
         <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
         <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
         <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+        {{#if @model.isStatic}}
+          <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+        {{/if}}
       </header.row>
     </table.header>
     <table.body as |body|>