SM-1159: Rename Service Accounts to Machine Accounts (#8444)

* SM-1159: Rename service accounts to machine accounts. Visible text only.

* SM-1159: Second round of adding service to machine account renames

* SM-1159: Change title

* SM-1159: Fix typo

* SM-1159: Add more keys

* SM-1159: Reordered keys

* SM-1159: Keys update

apps/web/src/app/admin-console/organizations/manage/events.component.ts

@@ -154,7 +154,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
 
     if (r.serviceAccountId) {
       return {
-        name: this.i18nService.t("serviceAccount") + " " + this.getShortId(r.serviceAccountId),
+        name: this.i18nService.t("machineAccount") + " " + this.getShortId(r.serviceAccountId),
       };
     }
 

apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html

@@ -33,7 +33,7 @@
     </bit-hint>
   </bit-form-field>
   <bit-form-field class="tw-w-2/3">
-    <bit-label>{{ "additionalServiceAccounts" | i18n }}</bit-label>
+    <bit-label>{{ "additionalMachineAccounts" | i18n }}</bit-label>
     <input
       bitInput
       id="additionalServiceAccountCount"
@@ -44,8 +44,8 @@
     />
     <bit-hint>
       <div>
-        {{ "includedServiceAccounts" | i18n: options.baseServiceAccountCount }}
-        {{ "addAdditionalServiceAccounts" | i18n: (monthlyServiceAccountPrice | currency: "$") }}
+        {{ "includedMachineAccounts" | i18n: options.baseServiceAccountCount }}
+        {{ "addAdditionalMachineAccounts" | i18n: (monthlyServiceAccountPrice | currency: "$") }}
       </div>
       <div>
         <strong>{{ "total" | i18n }}:</strong>
@@ -56,7 +56,7 @@
     </bit-hint>
   </bit-form-field>
   <bit-form-control>
-    <bit-label>{{ "limitServiceAccounts" | i18n }}</bit-label>
+    <bit-label>{{ "limitMachineAccounts" | i18n }}</bit-label>
     <input
       type="checkbox"
       bitCheckbox
@@ -64,11 +64,11 @@
       formControlName="limitServiceAccounts"
     />
     <bit-hint>
-      {{ "limitServiceAccountsDesc" | i18n }}
+      {{ "limitMachineAccountsDesc" | i18n }}
     </bit-hint>
   </bit-form-control>
   <bit-form-field class="tw-w-2/3" *ngIf="formGroup.value.limitServiceAccounts">
-    <bit-label>{{ "serviceAccountLimit" | i18n }}</bit-label>
+    <bit-label>{{ "machineAccountLimit" | i18n }}</bit-label>
     <input
       bitInput
       id="additionalServiceAccountLimit"
@@ -79,9 +79,9 @@
     />
     <bit-hint>
       <div>
-        {{ "includedServiceAccounts" | i18n: options.baseServiceAccountCount }}
+        {{ "includedMachineAccounts" | i18n: options.baseServiceAccountCount }}
       </div>
-      <strong>{{ "maxServiceAccountCost" | i18n }}:</strong>
+      <strong>{{ "maxMachineAccountCost" | i18n }}:</strong>
       {{ maxAdditionalServiceAccounts }} &times;
       {{ options.additionalServiceAccountPrice | currency: "$" }} =
       {{ maxServiceAccountTotalCost | currency: "$" }} / {{ options.interval | i18n }}

apps/web/src/app/billing/shared/sm-subscribe.component.html

@@ -20,10 +20,10 @@
         <ng-template #unlimitedProjects>
           <li>{{ "unlimitedProjects" | i18n }}</li>
         </ng-template>
-        <li>{{ "serviceAccountsIncluded" | i18n: serviceAccountsIncluded }}</li>
+        <li>{{ "machineAccountsIncluded" | i18n: serviceAccountsIncluded }}</li>
         <li *ngIf="product != productTypes.Free">
           {{
-            "additionalServiceAccountCost" | i18n: (monthlyCostPerServiceAccount | currency: "$")
+            "additionalMachineAccountCost" | i18n: (monthlyCostPerServiceAccount | currency: "$")
           }}
         </li>
       </ul>
@@ -54,12 +54,12 @@
       </div>
       <div *ngIf="selectedPlan.SecretsManager.hasAdditionalServiceAccountOption" class="tw-w-1/2">
         <bit-form-field>
-          <bit-label>{{ "additionalServiceAccounts" | i18n }}</bit-label>
+          <bit-label>{{ "additionalMachineAccounts" | i18n }}</bit-label>
           <input bitInput formControlName="additionalServiceAccounts" type="number" />
           <bit-hint>
-            {{ "includedServiceAccounts" | i18n: serviceAccountsIncluded }}
+            {{ "includedMachineAccounts" | i18n: serviceAccountsIncluded }}
             {{
-              "addAdditionalServiceAccounts" | i18n: (monthlyCostPerServiceAccount | currency: "$")
+              "addAdditionalMachineAccounts" | i18n: (monthlyCostPerServiceAccount | currency: "$")
             }}
           </bit-hint>
         </bit-form-field>

apps/web/src/app/shared/components/onboarding/onboarding.stories.ts

@@ -39,7 +39,7 @@ const Template: Story = (args) => ({
   template: `
     <app-onboarding title="Get started">
       <app-onboarding-task
-        [title]="'createServiceAccount' | i18n"
+        [title]="'createMachineAccount' | i18n"
         icon="bwi-cli"
         [completed]="createServiceAccount"
       >