From c0fb8aa9d4d46cd47fbff3cb8e2b0acc638549e1 Mon Sep 17 00:00:00 2001
From: Bayarbold8 <bayarbold187@gmail.com>
Date: Tue, 9 Jan 2024 16:53:53 +0800
Subject: [PATCH 1/8] translation file and internationalization

---
 addon/components/modals/group-details.hbs     |  8 +-
 addon/components/modals/group-form.hbs        | 10 +--
 addon/components/modals/policy-form.hbs       | 10 +--
 addon/components/modals/role-form.hbs         | 10 +--
 addon/components/modals/user-form.hbs         | 16 ++--
 addon/components/permission-picker.hbs        |  8 +-
 addon/components/table/cell/group-members.hbs |  2 +-
 addon/templates/application.hbs               | 12 +--
 addon/templates/groups/index.hbs              | 10 +--
 addon/templates/home.hbs                      |  2 +-
 addon/templates/policies/index.hbs            |  8 +-
 addon/templates/roles/index.hbs               |  8 +-
 addon/templates/users/index.hbs               | 10 +--
 translations/en-us.yaml                       | 74 ++++++++++++++++++-
 14 files changed, 130 insertions(+), 58 deletions(-)

diff --git a/addon/components/modals/group-details.hbs b/addon/components/modals/group-details.hbs
index 4d6d53b..31cfd2a 100644
--- a/addon/components/modals/group-details.hbs
+++ b/addon/components/modals/group-details.hbs
@@ -3,7 +3,7 @@
         <div class="grid grid-cols-3 gap-2 text-xs dark:text-gray-100">
             <div class="col-span-3 mb-5">
                 <label class="block mb-2 font-bold">
-                    Group Name
+                    {{t "iam.components.modals.group-details.group-name"}}
                 </label>
                 <span class="block truncate">
                     {{n-a @options.group.name}}
@@ -12,7 +12,7 @@
 
             <div class="mb-5">
                 <label class="block mb-2 font-bold">
-                    Members
+                    {{t "iam.common.member"}}
                 </label>
                 <span class="block truncate">
                     {{n-a @options.user.internal_id}}
@@ -21,7 +21,7 @@
 
             <div class="mb-5">
                 <label class="block mb-2 font-bold">
-                    Status
+                    {{t "iam.common.status"}}
                 </label>
                 <Badge @status={{@options.vendor.status}} />
             </div>
@@ -30,7 +30,7 @@
 
             <div class="col-span-2 mb-5">
                 <label class="block mb-2 font-bold">
-                    Address
+                    {{t "iam.common.address"}}
                 </label>
                 <div>
                     {{n-a (html-safe @options.vendor.address)}}
diff --git a/addon/components/modals/group-form.hbs b/addon/components/modals/group-form.hbs
index 976a804..605d137 100644
--- a/addon/components/modals/group-form.hbs
+++ b/addon/components/modals/group-form.hbs
@@ -3,23 +3,23 @@
         <div class="text-xs dark:text-gray-100">
             <div class="input-group">
                 <label>
-                    Group Name
+                    {{t "iam.components.modals.group-form.group-name"}}
                 </label>
                 <Input @value={{@options.group.name}} @type="text" class="w-full form-input" placeholder="Group Name" />
             </div>
             <div class="input-group">
                 <label>
-                    Group Description
+                    {{t "iam.components.modals.group-form.group-description"}}
                 </label>
                 <Textarea @value={{@options.group.description}} rows="5" class="w-full form-input" placeholder="Group Description" />
             </div>
 
             <div class="input-group">
                 <div class="mb-4">
-                    <InputLabel class="mb-2" @labelText="Select users to add to group" @helpText="Search and select users to add to this group." />
+                    <InputLabel class="mb-2" @labelText={{t "iam.components.modals.group-form.labelText"}} @helpText={{t "iam.components.modals.group-form.helpText"}} />
 
                     <div class="flex items-start justify-between">
-                        <ModelSelect @modelName="user" @selectedModel={{@options.lastSelectedUser}} @placeholder="Select user to add to group" class="w-64" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @onChange={{@options.addUser}} as |model|>
+                        <ModelSelect @modelName="user" @selectedModel={{@options.lastSelectedUser}} @placeholder={{t "iam.components.modals.group-form.placeholder"}} class="w-64" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @onChange={{@options.addUser}} as |model|>
                             {{model.name}}
                         </ModelSelect>
                     </div>
@@ -43,7 +43,7 @@
                         <div class="flex items-center justify-center h-full dark:text-gray-100">
                             <div class="flex flex-col items-center justify-center w-2/4 h-full my-8 text-center">
                                 <div class="text-base font-semibold">
-                                    No users added to group
+                                    {{t "iam.components.modals.group-form.no-user-group"}}
                                 </div>
                             </div>
                         </div>
diff --git a/addon/components/modals/policy-form.hbs b/addon/components/modals/policy-form.hbs
index dfbd383..20ae6a9 100644
--- a/addon/components/modals/policy-form.hbs
+++ b/addon/components/modals/policy-form.hbs
@@ -2,19 +2,19 @@
     <div class="modal-body-container" ...attributes>
         <div class="input-group">
             <label>
-                Policy Name
+                {{t "iam.components.modals.policy-form.policy-name"}}
             </label>
-            <Input @value={{@options.policy.name}} @type="text" class="w-full form-input" placeholder="Enter a name for your policy" />
+            <Input @value={{@options.policy.name}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.policy-form.placeholder"}} />
         </div>
         <div class="input-group">
             <label>
-                Policy Description
+                {{t "iam.components.modals.policy-form.policy-description"}}
             </label>
-            <Input @value={{@options.policy.description}} @type="text" class="w-full form-input" placeholder="Enter a description for your policy" />
+            <Input @value={{@options.policy.description}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.policy-form.placeholder-policy"}} />
         </div>
         <div class="input-group">
             <label>
-               Select Permissions
+               {{t "iam.components.modals.policy-form.select-permissions"}}
             </label>
             <PermissionPicker @selected={{@options.policy.permissions}} @onChange={{fn (mut @options.policy.permissions)}} />
         </div>
diff --git a/addon/components/modals/role-form.hbs b/addon/components/modals/role-form.hbs
index 9a626d4..f5e4b46 100644
--- a/addon/components/modals/role-form.hbs
+++ b/addon/components/modals/role-form.hbs
@@ -2,19 +2,19 @@
     <div class="modal-body-container" ...attributes>
         <div class="input-group">
             <label>
-                Role Name
+                {{t "iam.components.modals.role-form.role-name"}}
             </label>
-            <Input @value={{@options.role.name}} @type="text" class="w-full form-input" placeholder="Enter a name for this role" />
+            <Input @value={{@options.role.name}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.role-form.placeholder"}} />
         </div>
         <div class="input-group">
             <label>
-                Role Description
+                {{t "iam.components.modals.role-form.role-description"}}
             </label>
-            <Input @value={{@options.role.description}} @type="text" class="w-full form-input" placeholder="Enter a description for your role" />
+            <Input @value={{@options.role.description}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.role-form.placeholder-role"}} />
         </div>
         <div class="input-group">
             <label>
-                Select Permissions
+                {{t "iam.components.modals.role-form.select-permission"}}
             </label>
             <PermissionPicker @selected={{@options.role.permissionsArray}} @onChange={{@options.setPermissions}} />
         </div>
diff --git a/addon/components/modals/user-form.hbs b/addon/components/modals/user-form.hbs
index 45b751e..8c9655a 100644
--- a/addon/components/modals/user-form.hbs
+++ b/addon/components/modals/user-form.hbs
@@ -3,36 +3,36 @@
         <div class="flex">
             <div class="w-32 mb-6 mr-6">
                 <Image src={{@options.user.avatar_url}} @fallbackSrc={{config "defaultValues.userImage"}} alt={{@options.user.name}} height="128" width="128" class="h-32 w-32 rounded-md" />
-                <UploadButton @name="photos" @accept="image/*" @onFileAdded={{@options.uploadNewPhoto}} class="w-32" />
+                <UploadButton @name={{t "iam.common.photo"}} @accept="image/*" @onFileAdded={{@options.uploadNewPhoto}} class="w-32" />
             </div>
             <div class="flex-1">
                 <div class="grid grid-cols-2 gap-3 text-xs dark:text-gray-100">
                     <div class="input-group">
                         <label>
-                            Name
+                            {{t "iam.common.name"}}
                         </label>
-                        <Input @value={{@options.user.name}} @type="text" class="w-full form-input" placeholder="Name" />
+                        <Input @value={{@options.user.name}} @type="text" class="w-full form-input" placeholder={{t "iam.common.name"}} />
                     </div>
 
                     <div class="input-group">
                         <label>
-                            Email
+                            {{t "iam.common.email"}}
                         </label>
-                        <Input @value={{@options.user.email}} @type="text" class="w-full form-input" placeholder="Email" />
+                        <Input @value={{@options.user.email}} @type="text" class="w-full form-input" placeholder={{t "iam.common.email"}} />
                     </div>
 
                     <div class="input-group">
                         <label>
-                            Phone
+                            {{t "iam.common.phone"}}
                         </label>
                         <PhoneInput @value={{@options.user.phone}} @onInput={{fn (mut @options.user.phone)}} class="form-input w-full" />
                     </div>
 
                     <div class="input-group">
                         <label>
-                            Country
+                            {{t "iam.common.country"}}
                         </label>
-                        <CountrySelect class="w-full form-input form-select form-datalist" @value={{@options.user.country}} @onChange={{fn (mut @options.user.country)}} placeholder="Country" />
+                        <CountrySelect class="w-full form-input form-select form-datalist" @value={{@options.user.country}} @onChange={{fn (mut @options.user.country)}} placeholder={{t "iam.common.country"}} />
                     </div>
                 </div>
             </div>
diff --git a/addon/components/permission-picker.hbs b/addon/components/permission-picker.hbs
index 4167791..4942b96 100644
--- a/addon/components/permission-picker.hbs
+++ b/addon/components/permission-picker.hbs
@@ -2,7 +2,7 @@
     <div class="mb-2 flex items-center justify-between">
         <div class="flex items-center">
             <div class="permission-picker-search">
-                <Input @type="text" {{on "input" (perform this.search)}} placeholder="Search permissions by keywords" class="w-64 form-input form-input-sm" />
+                <Input @type="text" {{on "input" (perform this.search)}} placeholder={{t "iam.components.table.permission-picker.placeholder"}} class="w-64 form-input form-input-sm" />
             </div>
             <div>
                 {{#if this.isLoading}}
@@ -22,8 +22,8 @@
                 <div class="flex items-center">
                     <Checkbox @value={{this.allSelected}} @onToggle={{this.selectAll}} @disabled={{not this.permissions}} />
                 </div>
-                <div class="col-span-5 flex items-center">Permission</div>
-                <div class="col-span-6 flex items-center">Description</div>
+                <div class="col-span-5 flex items-center">{{t "iam.common.permission"}}</div>
+                <div class="col-span-6 flex items-center">{{t "iam.common.description"}}</div>
             </div>
         </div>
         <div class="h-48 overflow-y-scroll">
@@ -32,7 +32,7 @@
                     <div class="mr-2">
                         <Spinner @iconClass="text-sky-500" />
                     </div>
-                    <span>Loading permissions...</span>
+                    <span>{{t "iam.components.table.permission-picker.loading-permission"}}</span>
                 </div>
             {{/unless}}
             {{#each this.permissions as |permission|}}
diff --git a/addon/components/table/cell/group-members.hbs b/addon/components/table/cell/group-members.hbs
index 47a8bbb..03268a5 100644
--- a/addon/components/table/cell/group-members.hbs
+++ b/addon/components/table/cell/group-members.hbs
@@ -6,6 +6,6 @@
             </a>
         </div>
     {{else}}
-        <span>No Members</span>
+        <span>{{t "iam.components.table.group-members.no-member"}}</span>
     {{/each}}
 </div>
\ No newline at end of file
diff --git a/addon/templates/application.hbs b/addon/templates/application.hbs
index e319d09..78555f6 100644
--- a/addon/templates/application.hbs
+++ b/addon/templates/application.hbs
@@ -1,10 +1,10 @@
 <EmberWormhole @to="sidebar-menu-items">
-    <Layout::Sidebar::Panel @open={{true}} @title="Access Management">
-        <Layout::Sidebar::Item @route="console.iam.home" @icon="home">Dashboard</Layout::Sidebar::Item>
-        <Layout::Sidebar::Item @route="console.iam.users" @icon="id-card">Users</Layout::Sidebar::Item>
-        <Layout::Sidebar::Item @route="console.iam.groups" @icon="building">Groups</Layout::Sidebar::Item>
-        <Layout::Sidebar::Item @route="console.iam.roles" @icon="tag">Roles</Layout::Sidebar::Item>
-        <Layout::Sidebar::Item @route="console.iam.policies" @icon="shield">Policies</Layout::Sidebar::Item>
+    <Layout::Sidebar::Panel @open={{true}} @title={{t "iam.application.title"}}>
+        <Layout::Sidebar::Item @route="console.iam.home" @icon="home">{{t "iam.common.dashboard"}}</Layout::Sidebar::Item>
+        <Layout::Sidebar::Item @route="console.iam.users" @icon="id-card">{{t "iam.common.user"}}</Layout::Sidebar::Item>
+        <Layout::Sidebar::Item @route="console.iam.groups" @icon="building">{{t "iam.common.group"}}</Layout::Sidebar::Item>
+        <Layout::Sidebar::Item @route="console.iam.roles" @icon="tag">{{t "iam.common.role"}}</Layout::Sidebar::Item>
+        <Layout::Sidebar::Item @route="console.iam.policies" @icon="shield">{{t "iam.common.policie"}}</Layout::Sidebar::Item>
     </Layout::Sidebar::Panel>
 </EmberWormhole>
 
diff --git a/addon/templates/groups/index.hbs b/addon/templates/groups/index.hbs
index 72fa7a8..4ec80a7 100644
--- a/addon/templates/groups/index.hbs
+++ b/addon/templates/groups/index.hbs
@@ -1,17 +1,17 @@
-<Layout::Section::Header @title="Groups" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+<Layout::Section::Header @title={{t "iam.common.group"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
    {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "iam.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
                     <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteGroups)}}>
-                        Delete Groups
+                        {{t "iam.groups.index.delete-groups"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{this.createGroup}} />
-    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text="Export" @onClick={{this.exportGroups}} />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "iam.common.new"}} class="mr-2" @onClick={{this.createGroup}} />
+    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text={{t "iam.common.export"}} @onClick={{this.exportGroups}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>
diff --git a/addon/templates/home.hbs b/addon/templates/home.hbs
index fbda550..8fccb13 100644
--- a/addon/templates/home.hbs
+++ b/addon/templates/home.hbs
@@ -1,4 +1,4 @@
-<Layout::Section::Header @title="Identity & Access Management" @hideActions={{true}} />
+<Layout::Section::Header @title={{t "iam.home.title"}} @hideActions={{true}} />
 
 <Layout::Section::Body>
     <div class="container mx-auto h-screen" {{increase-height-by 800}}>
diff --git a/addon/templates/policies/index.hbs b/addon/templates/policies/index.hbs
index dfdaedc..5cc6569 100644
--- a/addon/templates/policies/index.hbs
+++ b/addon/templates/policies/index.hbs
@@ -1,16 +1,16 @@
-<Layout::Section::Header @title="Policies" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+<Layout::Section::Header @title={{t "iam.templates.policies.policie"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
    {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "iam.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
                     <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeletePolicies)}}>
-                        Delete Policies
+                        {{t "iam.policies.index.delete-policies"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{this.createPolicy}} />
+    <Button @icon="plus" @iconPrefix="fas" @type={{t "iam.policies.common.primary"}} @text={{t "iam.policies.common.new"}} class="mr-2" @onClick={{this.createPolicy}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>
diff --git a/addon/templates/roles/index.hbs b/addon/templates/roles/index.hbs
index c4c85aa..ee9d46d 100644
--- a/addon/templates/roles/index.hbs
+++ b/addon/templates/roles/index.hbs
@@ -1,16 +1,16 @@
-<Layout::Section::Header @title="Roles" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+<Layout::Section::Header @title={{t "iam.common.role"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
    {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "iam.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
                     <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteRoles)}}>
-                        Delete Roles
+                        {{t "iam.roles.index.delete-roles"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{this.createRole}} />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "iam.common.new"}} class="mr-2" @onClick={{this.createRole}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>
diff --git a/addon/templates/users/index.hbs b/addon/templates/users/index.hbs
index 033c335..c005f59 100644
--- a/addon/templates/users/index.hbs
+++ b/addon/templates/users/index.hbs
@@ -1,17 +1,17 @@
-<Layout::Section::Header @title="Users" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+<Layout::Section::Header @title={{t "iam.common.user"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
    {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "iam.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
                     <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteUsers)}}>
-                        Delete Users
+                        {{t "iam.users.index.delete-users"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{this.createUser}} />
-    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text="Export" @onClick={{this.exportUsers}} />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "iam.common.new"}} class="mr-2" @onClick={{this.createUser}} />
+    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text={{t "iam.common.export"}} @onClick={{this.exportUsers}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 590903f..c8bf3d9 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -1,2 +1,74 @@
 iam:
-  extension-name: IAM
\ No newline at end of file
+  extension-name: IAM
+    common:
+      new: New
+      export: Export
+      bulk-action: Bulk Action
+      primary: primary
+      role: roles
+      user: Users
+      dashboard: Dashboard 
+      group: Groups
+      policie: Policies
+      member: Members
+      status: Status
+      address: Address
+      photo: photos
+      name: Name
+      email: Email
+      phone: Phone
+      country: Country
+      permission: Permission
+      description: Description
+  components:
+    modals:
+      group-details:    
+        group-name: Group Name
+      group-form:
+        group-name: Group Name
+        group-description: Group Description
+        labelText: Select users to add to group
+        helpText: Search and select users to add to this group.
+        placeholder: Select user to add to group
+        no-user-group: No users added to group
+      policy-form:
+        policy-name: Policy Name
+        placeholder: Enter a name for your policy
+        policy-description: Policy Description
+        placeholder-policy: Enter a description for your policy
+        select-permissions: Select Permissions
+      role-form:
+        role-name: Role Name
+        placeholder: Enter a name for this role
+        role-description: Role Description
+        placeholder-role: Enter a description for your role
+        select-permission: Select Permissions
+      user-form:
+    table:
+      group-members:
+        no-member: No Members
+      permission-picker: 
+        placeholder: Search permissions by keywords
+        loading-permission: Loading permissions...
+  groups:
+    index:
+      delete-group: Delete Groups
+  policies:
+    index:
+      delete-policies: Delete Policies
+  rols:
+    index:
+      delete-roles: Delete Roles
+  users:
+    index:
+      delete-users: Delete Users
+  application:
+      title: Access Management
+  home:
+      title: Identity & Access Management
+  
+      
+
+
+
+      
\ No newline at end of file

From a629f1da1a822cc08f4034f9d0c67164d92fed75 Mon Sep 17 00:00:00 2001
From: Bayarbold8 <bayarbold187@gmail.com>
Date: Tue, 16 Jan 2024 18:23:12 +0800
Subject: [PATCH 2/8] iam-engine fixed some mistakes and updates

---
 addon/components/modals/group-form.hbs  | 10 ++--
 addon/components/modals/policy-form.hbs |  4 +-
 addon/components/modals/role-form.hbs   |  4 +-
 addon/components/permission-picker.hbs  |  2 +-
 addon/controllers/groups/index.js       | 31 ++++++----
 addon/controllers/policies/index.js     | 39 +++++++------
 addon/controllers/roles/index.js        | 33 ++++++-----
 addon/controllers/users/index.js        | 59 ++++++++++---------
 addon/templates/application.hbs         |  2 +-
 addon/templates/home.hbs                |  2 +-
 translations/en-us.yaml                 | 76 ++++++++++++++++++++-----
 11 files changed, 170 insertions(+), 92 deletions(-)

diff --git a/addon/components/modals/group-form.hbs b/addon/components/modals/group-form.hbs
index 605d137..ccd98ce 100644
--- a/addon/components/modals/group-form.hbs
+++ b/addon/components/modals/group-form.hbs
@@ -5,21 +5,21 @@
                 <label>
                     {{t "iam.components.modals.group-form.group-name"}}
                 </label>
-                <Input @value={{@options.group.name}} @type="text" class="w-full form-input" placeholder="Group Name" />
+                <Input @value={{@options.group.name}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.group-form.group-name"}} />
             </div>
             <div class="input-group">
                 <label>
                     {{t "iam.components.modals.group-form.group-description"}}
                 </label>
-                <Textarea @value={{@options.group.description}} rows="5" class="w-full form-input" placeholder="Group Description" />
+                <Textarea @value={{@options.group.description}} rows="5" class="w-full form-input" placeholder={{t "iam.components.modals.group-form.group-description"}} />
             </div>
 
             <div class="input-group">
                 <div class="mb-4">
-                    <InputLabel class="mb-2" @labelText={{t "iam.components.modals.group-form.labelText"}} @helpText={{t "iam.components.modals.group-form.helpText"}} />
+                    <InputLabel class="mb-2" @labelText={{t "iam.components.modals.group-form.select-users-add-group"}} @helpText={{t "iam.components.modals.group-form.search-select-users-add-group"}} />
 
                     <div class="flex items-start justify-between">
-                        <ModelSelect @modelName="user" @selectedModel={{@options.lastSelectedUser}} @placeholder={{t "iam.components.modals.group-form.placeholder"}} class="w-64" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @onChange={{@options.addUser}} as |model|>
+                        <ModelSelect @modelName="user" @selectedModel={{@options.lastSelectedUser}} @placeholder={{t "iam.components.modals.group-form.select-user-add-group"}} class="w-64" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @onChange={{@options.addUser}} as |model|>
                             {{model.name}}
                         </ModelSelect>
                     </div>
@@ -43,7 +43,7 @@
                         <div class="flex items-center justify-center h-full dark:text-gray-100">
                             <div class="flex flex-col items-center justify-center w-2/4 h-full my-8 text-center">
                                 <div class="text-base font-semibold">
-                                    {{t "iam.components.modals.group-form.no-user-group"}}
+                                    {{t "iam.components.modals.group-form.no-user-add-group"}}
                                 </div>
                             </div>
                         </div>
diff --git a/addon/components/modals/policy-form.hbs b/addon/components/modals/policy-form.hbs
index 20ae6a9..61fa60e 100644
--- a/addon/components/modals/policy-form.hbs
+++ b/addon/components/modals/policy-form.hbs
@@ -4,13 +4,13 @@
             <label>
                 {{t "iam.components.modals.policy-form.policy-name"}}
             </label>
-            <Input @value={{@options.policy.name}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.policy-form.placeholder"}} />
+            <Input @value={{@options.policy.name}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.policy-form.enter-name-your-policy"}} />
         </div>
         <div class="input-group">
             <label>
                 {{t "iam.components.modals.policy-form.policy-description"}}
             </label>
-            <Input @value={{@options.policy.description}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.policy-form.placeholder-policy"}} />
+            <Input @value={{@options.policy.description}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.policy-form.enter-description-your-policy"}} />
         </div>
         <div class="input-group">
             <label>
diff --git a/addon/components/modals/role-form.hbs b/addon/components/modals/role-form.hbs
index f5e4b46..4f1dc96 100644
--- a/addon/components/modals/role-form.hbs
+++ b/addon/components/modals/role-form.hbs
@@ -4,13 +4,13 @@
             <label>
                 {{t "iam.components.modals.role-form.role-name"}}
             </label>
-            <Input @value={{@options.role.name}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.role-form.placeholder"}} />
+            <Input @value={{@options.role.name}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.role-form.enter-name-for-this-role"}} />
         </div>
         <div class="input-group">
             <label>
                 {{t "iam.components.modals.role-form.role-description"}}
             </label>
-            <Input @value={{@options.role.description}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.role-form.placeholder-role"}} />
+            <Input @value={{@options.role.description}} @type="text" class="w-full form-input" placeholder={{t "iam.components.modals.role-form.enter-description-your-role"}} />
         </div>
         <div class="input-group">
             <label>
diff --git a/addon/components/permission-picker.hbs b/addon/components/permission-picker.hbs
index 4942b96..3f21377 100644
--- a/addon/components/permission-picker.hbs
+++ b/addon/components/permission-picker.hbs
@@ -2,7 +2,7 @@
     <div class="mb-2 flex items-center justify-between">
         <div class="flex items-center">
             <div class="permission-picker-search">
-                <Input @type="text" {{on "input" (perform this.search)}} placeholder={{t "iam.components.table.permission-picker.placeholder"}} class="w-64 form-input form-input-sm" />
+                <Input @type="text" {{on "input" (perform this.search)}} placeholder={{t "iam.components.table.permission-picker.search-permissions-keyword"}} class="w-64 form-input form-input-sm" />
             </div>
             <div>
                 {{#if this.isLoading}}
diff --git a/addon/controllers/groups/index.js b/addon/controllers/groups/index.js
index 89e6f02..025a395 100644
--- a/addon/controllers/groups/index.js
+++ b/addon/controllers/groups/index.js
@@ -20,6 +20,13 @@ export default class GroupsIndexController extends Controller {
      * @var {Service}
      */
     @service store;
+   
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
 
     /**
      * Inject the `notifications` service
@@ -105,7 +112,7 @@ export default class GroupsIndexController extends Controller {
      */
     @tracked columns = [
         {
-            label: 'Name',
+            label: this.intl.t('iam.common.name'),
             valuePath: 'name',
             cellComponent: 'table/cell/anchor',
             onClick: this.editGroup,
@@ -113,13 +120,13 @@ export default class GroupsIndexController extends Controller {
             sortable: false,
         },
         {
-            label: 'Description',
+            label: this.intl.t('iam.common.description'),
             valuePath: 'description',
             sortable: false,
             width: '25%',
         },
         {
-            label: 'Members',
+            label: this.intl.t('iam.common.member'),
             valuePath: 'users',
             cellComponent: 'table/cell/group-members',
             onClick: (user) => {
@@ -129,7 +136,7 @@ export default class GroupsIndexController extends Controller {
             width: '35%',
         },
         {
-            label: 'Created',
+            label: this.intl.t('iam.controllers.groups.index.created'),
             valuePath: 'createdAt',
             sortable: false,
             width: '10%',
@@ -148,11 +155,11 @@ export default class GroupsIndexController extends Controller {
             width: '10%',
             actions: [
                 {
-                    label: 'Edit group...',
+                    label: this.intl.t('storefront.controllers.groups.index.edit-group'),
                     fn: this.editGroup,
                 },
                 {
-                    label: 'Delete group...',
+                    label: this.intl.t('storefront.controllers.groups.index.delete-group-label'),
                     fn: this.deleteGroup,
                     className: 'text-red-700 hover:text-red-800',
                 },
@@ -195,7 +202,7 @@ export default class GroupsIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
-            acceptButtonText: 'Delete Groups',
+            acceptButtonText: this.intl.t('storefront.controllers.groups.index.delete-group'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },
@@ -220,12 +227,12 @@ export default class GroupsIndexController extends Controller {
         const group = this.store.createRecord('group', { users: [] });
 
         this.editGroup(group, {
-            title: 'New Group',
+            title: this.intl.t('storefront.controllers.groups.index.new-group'),
             group,
             confirm: (modal) => {
                 modal.startLoading();
                 return group.save().then(() => {
-                    this.notifications.success('New group created.');
+                    this.notifications.success(this.intl.t('storefront.controllers.groups.index.group-created'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -239,7 +246,7 @@ export default class GroupsIndexController extends Controller {
      */
     @action editGroup(group, options = {}) {
         this.modalsManager.show('modals/group-form', {
-            title: 'Edit Group',
+            title: this.intl.t('storefront.controllers.group.index.edit-group-title'),
             group,
             lastSelectedUser: null,
             removeUser: (user) => {
@@ -252,7 +259,7 @@ export default class GroupsIndexController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
                 return group.save().then(() => {
-                    this.notifications.success('Changes to group saved.');
+                    this.notifications.success(this.intl.t('storefront.controllers.groups.index.changes-group-save'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -268,7 +275,7 @@ export default class GroupsIndexController extends Controller {
     @action deleteGroup(group) {
         this.modalsManager.confirm({
             title: `Delete (${group.name || 'Untitled'}) group`,
-            body: 'Are you sure you want to delete this group? All data assosciated with this group will also be deleted. This action cannot be undone.',
+            body: this.intl.t('storefront.controllers.groups.index.data-assosciated-this-group-deleted'),
             confirm: (modal) => {
                 modal.startLoading();
                 return group.destroyRecord().then((group) => {
diff --git a/addon/controllers/policies/index.js b/addon/controllers/policies/index.js
index 7c94752..1d29555 100644
--- a/addon/controllers/policies/index.js
+++ b/addon/controllers/policies/index.js
@@ -14,6 +14,13 @@ export default class PoliciesIndexController extends Controller {
      */
     @service store;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `notifications` service
      *
@@ -98,7 +105,7 @@ export default class PoliciesIndexController extends Controller {
      */
     @tracked columns = [
         {
-            label: 'Name',
+            label: this.intl.t('iam.common.name'),
             valuePath: 'name',
             cellComponent: 'table/cell/anchor',
             onClick: this.editPolicy,
@@ -106,19 +113,19 @@ export default class PoliciesIndexController extends Controller {
             sortable: false,
         },
         {
-            label: 'Description',
+            label: this.intl.t('iam.common.description'),
             valuePath: 'description',
             sortable: false,
             width: '40%',
         },
         {
-            label: 'Type',
+            label: this.intl.t('iam.common.type'),
             valuePath: 'type',
             sortable: false,
             width: '20%',
         },
         {
-            label: 'Created',
+            label: this.intl.t('iam.common.create'),
             valuePath: 'createdAt',
             sortable: false,
             width: '10%',
@@ -131,17 +138,17 @@ export default class PoliciesIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: 'Contact Actions',
+            ddMenuLabel: this.intl.t('iam.controllers.policies.index.contact-action'),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: 'Edit policy...',
+                    label: this.intl.t('iam.controllers.policies.index.edit-policy'),
                     fn: this.editPolicy,
                 },
                 {
-                    label: 'Delete policy...',
+                    label: this.intl.t('iam.controllers.policies.index.delete-policy'),
                     fn: this.deletePolicy,
                     className: 'text-red-700 hover:text-red-800',
                 },
@@ -184,7 +191,7 @@ export default class PoliciesIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
-            acceptButtonText: 'Delete Policies',
+            acceptButtonText: this.intl.t('iam.controllers.policies.index.delete-policies'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },
@@ -203,11 +210,11 @@ export default class PoliciesIndexController extends Controller {
         });
 
         this.editPolicy(policy, {
-            title: 'New Policy',
+            title: this.intl.t('iam.controllers.policies.index.new-policy'),
             confirm: (modal) => {
                 modal.startLoading();
                 return policy.save().then(() => {
-                    this.notifications.success('New policy created.');
+                    this.notifications.success(this.intl.t('iam.controllers.policies.index.new-policy-created'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -221,16 +228,16 @@ export default class PoliciesIndexController extends Controller {
      */
     @action editPolicy(policy, options = {}) {
         if (!policy.is_mutable) {
-            return this.notifications.warning(`Unable to make changes to a ${policy.type} policy.`);
+            return this.notifications.warning(this.intl.t('iam.controllers.policies.index.unable-changes-policy-warning', {policyType: policy.type}));
         }
 
         this.modalsManager.show('modals/policy-form', {
-            title: 'Edit Policy',
+            title: this.intl.t('iam.controllers.policies.index.edit-policy-title'),
             policy,
             confirm: (modal) => {
                 modal.startLoading();
                 return policy.save().then(() => {
-                    this.notifications.success('Changes to policy saved.');
+                    this.notifications.success(this.intl.t('iam.controllers.policies.index.changes-policy-saved-success'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -245,16 +252,16 @@ export default class PoliciesIndexController extends Controller {
      */
     @action deletePolicy(policy) {
         if (!policy.is_deletable) {
-            return this.notifications.warning(`Unable to delete a ${policy.type} policy.`);
+            return this.notifications.warning(this.intl.t('iam.controllers.policies.index.unable-delete-policy-warning', {policyType: policy.type}));
         }
 
         this.modalsManager.confirm({
             title: `Delete (${policy.name || 'Untitled'}) policy`,
-            body: 'Are you sure you want to delete this policy? All data assosciated with this policy will also be deleted. This action cannot be undone.',
+            body: this.intl.t('iam.controllers.policies.index.data-assosciated-this-policy-deleted'),
             confirm: (modal) => {
                 modal.startLoading();
                 return policy.destroyRecord().then((policy) => {
-                    this.notifications.success(`Policy (${policy.name}) deleted.`);
+                    this.notifications.success(this.intl.t('iam.controllers.policies.index.policy-deleted', {policyName: policy.name}));
                     return this.hostRouter.refresh();
                 });
             },
diff --git a/addon/controllers/roles/index.js b/addon/controllers/roles/index.js
index af58622..c401782 100644
--- a/addon/controllers/roles/index.js
+++ b/addon/controllers/roles/index.js
@@ -14,6 +14,13 @@ export default class RolesIndexController extends Controller {
      */
     @service store;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `notifications` service
      *
@@ -98,7 +105,7 @@ export default class RolesIndexController extends Controller {
      */
     @tracked columns = [
         {
-            label: 'Name',
+            label: this.intl.t('iam.common.name'),
             valuePath: 'name',
             cellComponent: 'table/cell/anchor',
             onClick: this.editRole,
@@ -106,13 +113,13 @@ export default class RolesIndexController extends Controller {
             sortable: false,
         },
         {
-            label: 'Description',
+            label: this.intl.t('iam.common.description'),
             valuePath: 'description',
             sortable: false,
             width: '50%',
         },
         {
-            label: 'Created',
+            label: this.intl.t('iam.common.create'),
             valuePath: 'createdAt',
             sortable: false,
             width: '10%',
@@ -125,17 +132,17 @@ export default class RolesIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: 'Contact Actions',
+            ddMenuLabel: this.intl.t('iam.controllers.roles.index.contact-action'),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: 'Edit role...',
+                    label: this.intl.t('iam.controllers.roles.index.edit-role'),
                     fn: this.editRole,
                 },
                 {
-                    label: 'Delete role...',
+                    label: this.intl.t('iam.controllers.roles.index.delete-role'),
                     fn: this.deleteRole,
                     className: 'text-red-700 hover:text-red-800',
                 },
@@ -178,7 +185,7 @@ export default class RolesIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
-            acceptButtonText: 'Delete Roles',
+            acceptButtonText: this.intl.t('iam.controllers.roles.index.delete-roles'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },
@@ -194,11 +201,11 @@ export default class RolesIndexController extends Controller {
         const role = this.store.createRecord('role');
 
         this.editRole(role, {
-            title: 'New Role',
+            title: this.intl.t('iam.controllers.roles.index.new-role'),
             confirm: (modal) => {
                 modal.startLoading();
                 return role.save().then(() => {
-                    this.notifications.success('New role created.');
+                    this.notifications.success(this.intl.t('iam.controllers.roles.index.new-role-create'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -212,7 +219,7 @@ export default class RolesIndexController extends Controller {
      */
     @action editRole(role, options = {}) {
         this.modalsManager.show('modals/role-form', {
-            title: 'Edit Role',
+            title: this.intl.t('iam.controllers.roles.index.edit-role-title'),
             role,
             setPermissions: (permissions) => {
                 role.permissions = permissions;
@@ -220,7 +227,7 @@ export default class RolesIndexController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
                 return role.save().then(() => {
-                    this.notifications.success('Changes to role saved.');
+                    this.notifications.success(this.intl.t('iam.controllers.roles.index.changes-role-saved'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -236,11 +243,11 @@ export default class RolesIndexController extends Controller {
     @action deleteRole(role) {
         this.modalsManager.confirm({
             title: `Delete (${role.name || 'Untitled'}) role`,
-            body: 'Are you sure you want to delete this role? All data assosciated with this role will also be deleted. This action cannot be undone.',
+            body: this.intl.t('iam.controllers.roles.index.data-assosciated-this-role-deleted'),
             confirm: (modal) => {
                 modal.startLoading();
                 return role.destroyRecord().then((role) => {
-                    this.notifications.success(`Role (${role.name}) deleted.`);
+                    this.notifications.success(this.intl.t('iam.controllers.roles.index.role-deleted', {roleName: role.name} ));
                     return this.hostRouter.refresh();
                 });
             },
diff --git a/addon/controllers/users/index.js b/addon/controllers/users/index.js
index 43244a6..c20085a 100644
--- a/addon/controllers/users/index.js
+++ b/addon/controllers/users/index.js
@@ -14,6 +14,13 @@ export default class UsersIndexController extends Controller {
      */
     @service store;
 
+    /**
+     * Inject the `intl` service
+     *
+     * @var {Service}
+     */
+    @service intl;
+
     /**
      * Inject the `notifications` service
      *
@@ -98,7 +105,7 @@ export default class UsersIndexController extends Controller {
      */
     @tracked columns = [
         {
-            label: 'Name',
+            label: this.intl.t('iam.common.name'),
             valuePath: 'name',
             width: '170px',
             cellComponent: 'table/cell/user-name',
@@ -110,34 +117,34 @@ export default class UsersIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'Email',
+            label: this.intl.t('iam.common.email'),
             valuePath: 'email',
             cellComponent: 'click-to-copy',
             sortable: false,
             width: '12%',
         },
         {
-            label: 'Phone',
+            label: this.intl.t('iam.common.phone'),
             valuePath: 'phone',
             cellComponent: 'click-to-copy',
             sortable: false,
             width: '12%',
         },
         {
-            label: 'Type',
+            label: this.intl.t('iam.common.type'),
             valuePath: 'typesList',
             sortable: false,
             width: '12%',
         },
         {
-            label: 'Status',
+            label: this.intl.t('iam.common.status'),
             valuePath: 'session_status',
             sortable: false,
             width: '12%',
             cellComponent: 'table/cell/status',
         },
         {
-            label: 'Last Login',
+            label: this.intl.t('iam.controllers.users.index.last-login'),
             valuePath: 'lastLogin',
             width: '130px',
             resizable: true,
@@ -146,7 +153,7 @@ export default class UsersIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
-            label: 'Created At',
+            label: this.intl.t('iam.controllers.users.index.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
             width: '130px',
@@ -156,7 +163,7 @@ export default class UsersIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
-            label: 'Updated At',
+            label: this.intl.t('iam.controllers.users.index.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
             width: '130px',
@@ -172,34 +179,34 @@ export default class UsersIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: 'Contact Actions',
+            ddMenuLabel: this.intl.t('iam.controllers.users.index.contact-action'),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: 'Edit user...',
+                    label: this.intl.t('iam.controllers.users.index.edit-user'),
                     fn: this.editUser,
                 },
                 {
-                    label: 'Re-send invitation...',
+                    label: this.intl.t('iam.controllers.users.index.re-send-invitation'),
                     fn: this.resendInvitation,
                     isVisible: (user) => user.get('session_status') === 'pending',
                 },
                 {
-                    label: 'Deactivate user...',
+                    label: this.intl.t('iam.controllers.users.index.deactivate-user'),
                     fn: this.deactivateUser,
                     className: 'text-danger',
                     isVisible: (user) => user.get('session_status') === 'active',
                 },
                 {
-                    label: 'Activate user...',
+                    label: this.intl.t('iam.controllers.users.index.activate-user'),
                     fn: this.activateUser,
                     className: 'text-danger',
                     isVisible: (user) => user.get('session_status') === 'inactive' || (this.currentUser.user.is_admin && user.get('session_status') === 'pending'),
                 },
                 {
-                    label: 'Delete user...',
+                    label: this.intl.t('iam.controllers.users.index.delete-user'),
                     fn: this.deleteUser,
                     className: 'text-danger',
                 },
@@ -246,7 +253,7 @@ export default class UsersIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
-            acceptButtonText: 'Delete Users',
+            acceptButtonText: this.intl.t('iam.controllers.users.index.delete-users'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },
@@ -274,14 +281,14 @@ export default class UsersIndexController extends Controller {
         });
 
         this.editUser(user, {
-            title: 'New User',
+            title: this.intl.t('iam.controllers.users.index.new-user'),
             confirm: (modal) => {
                 modal.startLoading();
 
                 user.save()
                     .then(() => {
                         modal.done();
-                        this.notifications.success('User has been invited to join your organization.');
+                        this.notifications.success(this.intl.t('iam.controlles.users.index.user-invited-join-your-organization-success'));
                         return this.hostRouter.refresh();
                     })
                     .catch((error) => {
@@ -299,7 +306,7 @@ export default class UsersIndexController extends Controller {
      */
     @action editUser(user, options = {}) {
         this.modalsManager.show('modals/user-form', {
-            title: 'Edit User',
+            title: this.intl.t('iam.controllers.users.index.edit-user-title'),
             user,
             uploadNewPhoto: (file) => {
                 this.fetch.uploadFile.perform(
@@ -325,7 +332,7 @@ export default class UsersIndexController extends Controller {
                 user.save()
                     .then(() => {
                         modal.done();
-                        this.notifications.success('User changes saved.');
+                        this.notifications.success(this.intl.t('iam.controlles.users.index.user-changes-saved-success'));
                         return this.hostRouter.refresh();
                     })
                     .catch((error) => {
@@ -344,12 +351,12 @@ export default class UsersIndexController extends Controller {
      */
     @action deleteUser(user) {
         if (user.id === this.currentUser.id) {
-            return this.notifications.error("You can't delete yourself");
+            return this.notifications.error(this.intl.t('iam.controllers.users.index.error-you-cant-delete-yourself'));
         }
 
         this.modalsManager.confirm({
             title: `Delete ${user.get('name')} user`,
-            body: 'Are you sure you want to delete this user? All data assosciated with this user will also be deleted. This action cannot be undone.',
+            body: this.intl.t('iam.controllers.users.index.data-assosciated-user-delete'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.removeFromCurrentCompany().then(() => {
@@ -368,7 +375,7 @@ export default class UsersIndexController extends Controller {
     @action deactivateUser(user) {
         this.modalsManager.confirm({
             title: `Deactivate ${user.get('name')} user's account`,
-            body: 'Are you sure you want to deactivate this user? This user will no longer be able to access their account or resources unless re-activated.',
+            body: this.intl.t('iam.controllers.users.index.access-account-or-resources-unless-re-activated'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.deactivate().then(() => {
@@ -387,7 +394,7 @@ export default class UsersIndexController extends Controller {
     @action activateUser(user) {
         this.modalsManager.confirm({
             title: `Re-activate ${user.get('name')} user's account`,
-            body: 'Are you sure you want to re-activate this user? This user will regain access to your organization.',
+            body: this.intl.t('iam.controllers.users.index.this-user-will-regain-access-to-your-organization'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.activate().then(() => {
@@ -405,12 +412,12 @@ export default class UsersIndexController extends Controller {
      */
     @action resendInvitation(user) {
         this.modalsManager.confirm({
-            title: `Resend invitation to join organization`,
-            body: 'By confirming Fleetbase will re-send the invitation for this user to join your organization.',
+            title: this.intl.t('iam.controllers.users.index.resend-invitation-to-join-organization'),
+            body: this.intl.t('iam.controllers.users.index.confirming-fleetbase-will-re-send-invitation-for-user-to-join-your-organization'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.resendInvite().then(() => {
-                    this.notifications.success('Invitation resent.');
+                    this.notifications.success(this.intl.t('iam.controllers.users.index.invitation-resent'));
                     this.hostRouter.refresh();
                 });
             },
diff --git a/addon/templates/application.hbs b/addon/templates/application.hbs
index 78555f6..b242423 100644
--- a/addon/templates/application.hbs
+++ b/addon/templates/application.hbs
@@ -1,5 +1,5 @@
 <EmberWormhole @to="sidebar-menu-items">
-    <Layout::Sidebar::Panel @open={{true}} @title={{t "iam.application.title"}}>
+    <Layout::Sidebar::Panel @open={{true}} @title={{t "iam.application.access-management"}}>
         <Layout::Sidebar::Item @route="console.iam.home" @icon="home">{{t "iam.common.dashboard"}}</Layout::Sidebar::Item>
         <Layout::Sidebar::Item @route="console.iam.users" @icon="id-card">{{t "iam.common.user"}}</Layout::Sidebar::Item>
         <Layout::Sidebar::Item @route="console.iam.groups" @icon="building">{{t "iam.common.group"}}</Layout::Sidebar::Item>
diff --git a/addon/templates/home.hbs b/addon/templates/home.hbs
index 8fccb13..cf0c9b9 100644
--- a/addon/templates/home.hbs
+++ b/addon/templates/home.hbs
@@ -1,4 +1,4 @@
-<Layout::Section::Header @title={{t "iam.home.title"}} @hideActions={{true}} />
+<Layout::Section::Header @title={{t "iam.home.identity-access-management"}} @hideActions={{true}} />
 
 <Layout::Section::Body>
     <div class="container mx-auto h-screen" {{increase-height-by 800}}>
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index c8bf3d9..ca61cda 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -20,6 +20,8 @@ iam:
       country: Country
       permission: Permission
       description: Description
+      type: Type
+      create: Created
   components:
     modals:
       group-details:    
@@ -27,45 +29,93 @@ iam:
       group-form:
         group-name: Group Name
         group-description: Group Description
-        labelText: Select users to add to group
-        helpText: Search and select users to add to this group.
-        placeholder: Select user to add to group
-        no-user-group: No users added to group
+        select-users-add-group: Select users to add to group
+        search-select-users-add-group: Search and select users to add to this group.
+        select-user-add-group: Select user to add to group
+        no-user-add-group: No users added to group
       policy-form:
         policy-name: Policy Name
-        placeholder: Enter a name for your policy
+        enter-name-your-policy: Enter a name for your policy
         policy-description: Policy Description
-        placeholder-policy: Enter a description for your policy
+        enter-description-your-policy: Enter a description for your policy
         select-permissions: Select Permissions
       role-form:
         role-name: Role Name
-        placeholder: Enter a name for this role
+        enter-name-for-this-role: Enter a name for this role
         role-description: Role Description
-        placeholder-role: Enter a description for your role
+        enter-description-your-role: Enter a description for your role
         select-permission: Select Permissions
-      user-form:
     table:
       group-members:
         no-member: No Members
       permission-picker: 
-        placeholder: Search permissions by keywords
+        search-permissions-keyword: Search permissions by keywords
         loading-permission: Loading permissions...
   groups:
     index:
       delete-group: Delete Groups
+      created: Created
+      edit-group: Edit group...
+      delete-group-label: Delete group...
+      new-group: New Group
+      new-group-created: New group created.
+      edit-group-title: Edit Group
+      changes-group-save: Changes to group saved.
+      data-assosciated-this-group-deleted: Are you sure you want to delete this group? All data assosciated with this group will also be deleted. This action cannot be undone.
   policies:
     index:
       delete-policies: Delete Policies
-  rols:
+      contact-action: Contact Actions
+      edit-policy: Edit policy...
+      delete-policy: Delete policy...
+      new-policy: New Policy
+      new-policy-created: New policy created.
+      unable-changes-policy-warning: Unable to make changes to a {policy.type} policy.
+      edit-policy-title: Edit Policy
+      changes-policy-saved-success: Changes to policy saved.
+      unable-delete-policy-warning: Unable to delete a {policy.type} policy.
+      data-assosciated-this-policy-deleted: Are you sure you want to delete this policy? All data assosciated with this policy will also be deleted. This action cannot be undone.
+      policy-deleted: Policy {policy.name} deleted.
+  roles:
     index:
       delete-roles: Delete Roles
+      contact-action: Contact Actions
+      edit-role: Edit role...
+      delete-role: Delete role...
+      new-role: New Role
+      new-role-create: New role created
+      edit-role-title: Edit Role
+      changes-role-saved: Changes to role saved.
+      data-assosciated-this-role-deleted: Are you sure you want to delete this role? All data assosciated with this role will also be deleted. This action cannot be undone.
+      role-deleted: Role {role.name} deleted.
   users:
     index:
       delete-users: Delete Users
+      last-login: Last Login
+      created-at: Created At
+      updated-at: Updated At
+      contact-action: Contact Actions
+      edit-user: Edit user...
+      re-send-invitation: Re-send invitation...
+      deactivate-user: Deactivate user...
+      activate-user: Activate user...
+      delete-user: Delete user...
+      delete-users: Delete Users
+      new-user: New User
+      user-invited-join-your-organization-success: User has been invited to join your organization.
+      edit-user-title: Edit User
+      user-changes-saved-success: User changes saved.
+      error-you-cant-delete-yourself: You can't delete yourself
+      data-assosciated-user-delete: Are you sure you want to delete this user? All data assosciated with this user will also be deleted. This action cannot be undone.
+      access-account-or-resources-unless-re-activated: Are you sure you want to deactivate this user? This user will no longer be able to access their account or resources unless re-activated.
+      this-user-will-regain-access-to-your-organization: Are you sure you want to re-activate this user? This user will regain access to your organization.
+      resend-invitation-to-join-organization: Resend invitation to join organization
+      confirming-fleetbase-will-re-send-invitation-for-user-to-join-your-organization: By confirming Fleetbase will re-send the invitation for this user to join your organization.
+      invitation-resent: Invitation resent.
   application:
-      title: Access Management
+      access-management: Access Management
   home:
-      title: Identity & Access Management
+      identity-access-management: Identity & Access Management
   
       
 

From 41d770ff554d0815e7ed720bdbf644ed77044a08 Mon Sep 17 00:00:00 2001
From: Munkh-erdene Damdinbazar <mmddd@Munkh-erdenes-MacBook-Pro.local>
Date: Thu, 18 Jan 2024 16:33:41 +0800
Subject: [PATCH 3/8] fixed mistakes and updated translation file

---
 addon/components/permission-picker.hbs |  6 +--
 addon/controllers/groups/index.js      | 25 +++++----
 addon/controllers/policies/index.js    | 24 ++++-----
 addon/controllers/roles/index.js       | 20 ++++----
 addon/controllers/users/index.js       | 54 ++++++++++----------
 addon/templates/policies/index.hbs     |  4 +-
 translations/en-us.yaml                | 71 +++++++++++++++-----------
 7 files changed, 109 insertions(+), 95 deletions(-)

diff --git a/addon/components/permission-picker.hbs b/addon/components/permission-picker.hbs
index 3f21377..1bf3fe3 100644
--- a/addon/components/permission-picker.hbs
+++ b/addon/components/permission-picker.hbs
@@ -2,7 +2,7 @@
     <div class="mb-2 flex items-center justify-between">
         <div class="flex items-center">
             <div class="permission-picker-search">
-                <Input @type="text" {{on "input" (perform this.search)}} placeholder={{t "iam.components.table.permission-picker.search-permissions-keyword"}} class="w-64 form-input form-input-sm" />
+                <Input @type="text" {{on "input" (perform this.search)}} placeholder={{t "iam.components.permission-picker.search-permissions-keyword"}} class="w-64 form-input form-input-sm" />
             </div>
             <div>
                 {{#if this.isLoading}}
@@ -13,7 +13,7 @@
             </div>
         </div>
         <div class="text-sm dark:text-gray-100">
-            Selected: {{this.selected.length}}
+            {{t "iam.components.permission-picker.selected"}} {{this.selected.length}}
         </div>
     </div>
     <div class="bg-white border border-gray-200 rounded shadow-sm dark:bg-gray-700 dark:border-gray-900 text-xs">
@@ -32,7 +32,7 @@
                     <div class="mr-2">
                         <Spinner @iconClass="text-sky-500" />
                     </div>
-                    <span>{{t "iam.components.table.permission-picker.loading-permission"}}</span>
+                    <span>{{t "iam.components.permission-picker.loading-permission"}}</span>
                 </div>
             {{/unless}}
             {{#each this.permissions as |permission|}}
diff --git a/addon/controllers/groups/index.js b/addon/controllers/groups/index.js
index 025a395..2eefe39 100644
--- a/addon/controllers/groups/index.js
+++ b/addon/controllers/groups/index.js
@@ -5,6 +5,7 @@ import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
+import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 
 export default class GroupsIndexController extends Controller {
     /**
@@ -136,7 +137,7 @@ export default class GroupsIndexController extends Controller {
             width: '35%',
         },
         {
-            label: this.intl.t('iam.controllers.groups.index.created'),
+            label: this.intl.t('iam.groups.index.created'),
             valuePath: 'createdAt',
             sortable: false,
             width: '10%',
@@ -155,11 +156,11 @@ export default class GroupsIndexController extends Controller {
             width: '10%',
             actions: [
                 {
-                    label: this.intl.t('storefront.controllers.groups.index.edit-group'),
+                    label: this.intl.t('iam.groups.index.edit-group'),
                     fn: this.editGroup,
                 },
                 {
-                    label: this.intl.t('storefront.controllers.groups.index.delete-group-label'),
+                    label: this.intl.t('iam.groups.index.delete-group-label'),
                     fn: this.deleteGroup,
                     className: 'text-red-700 hover:text-red-800',
                 },
@@ -202,7 +203,7 @@ export default class GroupsIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
-            acceptButtonText: this.intl.t('storefront.controllers.groups.index.delete-group'),
+            acceptButtonText: this.intl.t('aim.groups.index.delete-group'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },
@@ -227,12 +228,12 @@ export default class GroupsIndexController extends Controller {
         const group = this.store.createRecord('group', { users: [] });
 
         this.editGroup(group, {
-            title: this.intl.t('storefront.controllers.groups.index.new-group'),
+            title: this.intl.t('iam.groups.index.new-group'),
             group,
             confirm: (modal) => {
                 modal.startLoading();
                 return group.save().then(() => {
-                    this.notifications.success(this.intl.t('storefront.controllers.groups.index.group-created'));
+                    this.notifications.success(this.intl.t('iam.groups.index.new-group-created'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -246,7 +247,7 @@ export default class GroupsIndexController extends Controller {
      */
     @action editGroup(group, options = {}) {
         this.modalsManager.show('modals/group-form', {
-            title: this.intl.t('storefront.controllers.group.index.edit-group-title'),
+            title: this.intl.t('iam.groups.index.edit-group-title'),
             group,
             lastSelectedUser: null,
             removeUser: (user) => {
@@ -259,7 +260,7 @@ export default class GroupsIndexController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
                 return group.save().then(() => {
-                    this.notifications.success(this.intl.t('storefront.controllers.groups.index.changes-group-save'));
+                    this.notifications.success(this.intl.t('iam.groups.index.changes-group-save'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -273,13 +274,15 @@ export default class GroupsIndexController extends Controller {
      * @void
      */
     @action deleteGroup(group) {
+        const groupName = getWithDefault(group, 'name', this.intl.t('iam.groups.index.untitled'));
+
         this.modalsManager.confirm({
-            title: `Delete (${group.name || 'Untitled'}) group`,
-            body: this.intl.t('storefront.controllers.groups.index.data-assosciated-this-group-deleted'),
+            title: this.intl.t('iam.groups.index.delete-group-title', { groupName }),
+            body: this.intl.t('iam.groups.index.data-assosciated-this-group-deleted'),
             confirm: (modal) => {
                 modal.startLoading();
                 return group.destroyRecord().then((group) => {
-                    this.notifications.success(`Group (${group.name}) deleted.`);
+                    this.notifications.success(this.intl.t('iam.groups.index.delete-group-success-message', {name: group.name }),);
                     this.hostRouter.refresh();
                 });
             },
diff --git a/addon/controllers/policies/index.js b/addon/controllers/policies/index.js
index 1d29555..f49679d 100644
--- a/addon/controllers/policies/index.js
+++ b/addon/controllers/policies/index.js
@@ -138,17 +138,17 @@ export default class PoliciesIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: this.intl.t('iam.controllers.policies.index.contact-action'),
+            ddMenuLabel: this.intl.t('iam.policies.index.contact-action'),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: this.intl.t('iam.controllers.policies.index.edit-policy'),
+                    label: this.intl.t('iam.policies.index.edit-policy'),
                     fn: this.editPolicy,
                 },
                 {
-                    label: this.intl.t('iam.controllers.policies.index.delete-policy'),
+                    label: this.intl.t('iam.policies.index.delete-policy'),
                     fn: this.deletePolicy,
                     className: 'text-red-700 hover:text-red-800',
                 },
@@ -191,7 +191,7 @@ export default class PoliciesIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
-            acceptButtonText: this.intl.t('iam.controllers.policies.index.delete-policies'),
+            acceptButtonText: this.intl.t('iam.policies.index.delete-policies'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },
@@ -210,11 +210,11 @@ export default class PoliciesIndexController extends Controller {
         });
 
         this.editPolicy(policy, {
-            title: this.intl.t('iam.controllers.policies.index.new-policy'),
+            title: this.intl.t('iam.policies.index.new-policy'),
             confirm: (modal) => {
                 modal.startLoading();
                 return policy.save().then(() => {
-                    this.notifications.success(this.intl.t('iam.controllers.policies.index.new-policy-created'));
+                    this.notifications.success(this.intl.t('iam.policies.index.new-policy-created'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -228,16 +228,16 @@ export default class PoliciesIndexController extends Controller {
      */
     @action editPolicy(policy, options = {}) {
         if (!policy.is_mutable) {
-            return this.notifications.warning(this.intl.t('iam.controllers.policies.index.unable-changes-policy-warning', {policyType: policy.type}));
+            return this.notifications.warning(this.intl.t('iam.policies.index.unable-changes-policy-warning', {policyType: policy.type}));
         }
 
         this.modalsManager.show('modals/policy-form', {
-            title: this.intl.t('iam.controllers.policies.index.edit-policy-title'),
+            title: this.intl.t('iam.policies.index.edit-policy-title'),
             policy,
             confirm: (modal) => {
                 modal.startLoading();
                 return policy.save().then(() => {
-                    this.notifications.success(this.intl.t('iam.controllers.policies.index.changes-policy-saved-success'));
+                    this.notifications.success(this.intl.t('iam.policies.index.changes-policy-saved-success'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -252,16 +252,16 @@ export default class PoliciesIndexController extends Controller {
      */
     @action deletePolicy(policy) {
         if (!policy.is_deletable) {
-            return this.notifications.warning(this.intl.t('iam.controllers.policies.index.unable-delete-policy-warning', {policyType: policy.type}));
+            return this.notifications.warning(this.intl.t('iam.policies.index.unable-delete-policy-warning', {policyType: policy.type}));
         }
 
         this.modalsManager.confirm({
             title: `Delete (${policy.name || 'Untitled'}) policy`,
-            body: this.intl.t('iam.controllers.policies.index.data-assosciated-this-policy-deleted'),
+            body: this.intl.t('iam.policies.index.data-assosciated-this-policy-deleted'),
             confirm: (modal) => {
                 modal.startLoading();
                 return policy.destroyRecord().then((policy) => {
-                    this.notifications.success(this.intl.t('iam.controllers.policies.index.policy-deleted', {policyName: policy.name}));
+                    this.notifications.success(this.intl.t('iam.policies.index.policy-deleted', {policyName: policy.name}));
                     return this.hostRouter.refresh();
                 });
             },
diff --git a/addon/controllers/roles/index.js b/addon/controllers/roles/index.js
index c401782..993f596 100644
--- a/addon/controllers/roles/index.js
+++ b/addon/controllers/roles/index.js
@@ -132,17 +132,17 @@ export default class RolesIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: this.intl.t('iam.controllers.roles.index.contact-action'),
+            ddMenuLabel: this.intl.t('iam.roles.index.contact-action'),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: this.intl.t('iam.controllers.roles.index.edit-role'),
+                    label: this.intl.t('iam.roles.index.edit-role'),
                     fn: this.editRole,
                 },
                 {
-                    label: this.intl.t('iam.controllers.roles.index.delete-role'),
+                    label: this.intl.t('iam.roles.index.delete-role'),
                     fn: this.deleteRole,
                     className: 'text-red-700 hover:text-red-800',
                 },
@@ -185,7 +185,7 @@ export default class RolesIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
-            acceptButtonText: this.intl.t('iam.controllers.roles.index.delete-roles'),
+            acceptButtonText: this.intl.t('iam.roles.index.delete-roles'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },
@@ -201,11 +201,11 @@ export default class RolesIndexController extends Controller {
         const role = this.store.createRecord('role');
 
         this.editRole(role, {
-            title: this.intl.t('iam.controllers.roles.index.new-role'),
+            title: this.intl.t('iam.roles.index.new-role'),
             confirm: (modal) => {
                 modal.startLoading();
                 return role.save().then(() => {
-                    this.notifications.success(this.intl.t('iam.controllers.roles.index.new-role-create'));
+                    this.notifications.success(this.intl.t('iam.roles.index.new-role-create'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -219,7 +219,7 @@ export default class RolesIndexController extends Controller {
      */
     @action editRole(role, options = {}) {
         this.modalsManager.show('modals/role-form', {
-            title: this.intl.t('iam.controllers.roles.index.edit-role-title'),
+            title: this.intl.t('iam.roles.index.edit-role-title'),
             role,
             setPermissions: (permissions) => {
                 role.permissions = permissions;
@@ -227,7 +227,7 @@ export default class RolesIndexController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
                 return role.save().then(() => {
-                    this.notifications.success(this.intl.t('iam.controllers.roles.index.changes-role-saved'));
+                    this.notifications.success(this.intl.t('iam.roles.index.changes-role-saved'));
                     return this.hostRouter.refresh();
                 });
             },
@@ -243,11 +243,11 @@ export default class RolesIndexController extends Controller {
     @action deleteRole(role) {
         this.modalsManager.confirm({
             title: `Delete (${role.name || 'Untitled'}) role`,
-            body: this.intl.t('iam.controllers.roles.index.data-assosciated-this-role-deleted'),
+            body: this.intl.t('iam.roles.index.data-assosciated-this-role-deleted'),
             confirm: (modal) => {
                 modal.startLoading();
                 return role.destroyRecord().then((role) => {
-                    this.notifications.success(this.intl.t('iam.controllers.roles.index.role-deleted', {roleName: role.name} ));
+                    this.notifications.success(this.intl.t('iam.roles.index.role-deleted', {roleName: role.name} ));
                     return this.hostRouter.refresh();
                 });
             },
diff --git a/addon/controllers/users/index.js b/addon/controllers/users/index.js
index c20085a..b679652 100644
--- a/addon/controllers/users/index.js
+++ b/addon/controllers/users/index.js
@@ -144,7 +144,7 @@ export default class UsersIndexController extends Controller {
             cellComponent: 'table/cell/status',
         },
         {
-            label: this.intl.t('iam.controllers.users.index.last-login'),
+            label: this.intl.t('iam.users.index.last-login'),
             valuePath: 'lastLogin',
             width: '130px',
             resizable: true,
@@ -153,7 +153,7 @@ export default class UsersIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
-            label: this.intl.t('iam.controllers.users.index.created-at'),
+            label: this.intl.t('iam.users.index.created-at'),
             valuePath: 'createdAt',
             sortParam: 'created_at',
             width: '130px',
@@ -163,7 +163,7 @@ export default class UsersIndexController extends Controller {
             filterComponent: 'filter/date',
         },
         {
-            label: this.intl.t('iam.controllers.users.index.updated-at'),
+            label: this.intl.t('iam.users.index.updated-at'),
             valuePath: 'updatedAt',
             sortParam: 'updated_at',
             width: '130px',
@@ -179,34 +179,34 @@ export default class UsersIndexController extends Controller {
             ddButtonText: false,
             ddButtonIcon: 'ellipsis-h',
             ddButtonIconPrefix: 'fas',
-            ddMenuLabel: this.intl.t('iam.controllers.users.index.contact-action'),
+            ddMenuLabel: this.intl.t('iam.users.index.contact-action'),
             cellClassNames: 'overflow-visible',
             wrapperClass: 'flex items-center justify-end mx-2',
             width: '10%',
             actions: [
                 {
-                    label: this.intl.t('iam.controllers.users.index.edit-user'),
+                    label: this.intl.t('iam.users.index.edit-user'),
                     fn: this.editUser,
                 },
                 {
-                    label: this.intl.t('iam.controllers.users.index.re-send-invitation'),
+                    label: this.intl.t('iam.users.index.re-send-invitation'),
                     fn: this.resendInvitation,
                     isVisible: (user) => user.get('session_status') === 'pending',
                 },
                 {
-                    label: this.intl.t('iam.controllers.users.index.deactivate-user'),
+                    label: this.intl.t('iam.users.index.deactivate-user'),
                     fn: this.deactivateUser,
                     className: 'text-danger',
                     isVisible: (user) => user.get('session_status') === 'active',
                 },
                 {
-                    label: this.intl.t('iam.controllers.users.index.activate-user'),
+                    label: this.intl.t('iam.users.index.activate-user'),
                     fn: this.activateUser,
                     className: 'text-danger',
                     isVisible: (user) => user.get('session_status') === 'inactive' || (this.currentUser.user.is_admin && user.get('session_status') === 'pending'),
                 },
                 {
-                    label: this.intl.t('iam.controllers.users.index.delete-user'),
+                    label: this.intl.t('iam.users.index.delete-user'),
                     fn: this.deleteUser,
                     className: 'text-danger',
                 },
@@ -253,7 +253,7 @@ export default class UsersIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: `name`,
-            acceptButtonText: this.intl.t('iam.controllers.users.index.delete-users'),
+            acceptButtonText: this.intl.t('iam.users.index.delete-users'),
             onSuccess: () => {
                 return this.hostRouter.refresh();
             },
@@ -281,14 +281,14 @@ export default class UsersIndexController extends Controller {
         });
 
         this.editUser(user, {
-            title: this.intl.t('iam.controllers.users.index.new-user'),
+            title: this.intl.t('iam.users.index.new-user'),
             confirm: (modal) => {
                 modal.startLoading();
 
                 user.save()
                     .then(() => {
                         modal.done();
-                        this.notifications.success(this.intl.t('iam.controlles.users.index.user-invited-join-your-organization-success'));
+                        this.notifications.success(this.intl.t('iam.users.index.user-invited-join-your-organization-success'));
                         return this.hostRouter.refresh();
                     })
                     .catch((error) => {
@@ -306,7 +306,7 @@ export default class UsersIndexController extends Controller {
      */
     @action editUser(user, options = {}) {
         this.modalsManager.show('modals/user-form', {
-            title: this.intl.t('iam.controllers.users.index.edit-user-title'),
+            title: this.intl.t('iam.users.index.edit-user-title'),
             user,
             uploadNewPhoto: (file) => {
                 this.fetch.uploadFile.perform(
@@ -332,7 +332,7 @@ export default class UsersIndexController extends Controller {
                 user.save()
                     .then(() => {
                         modal.done();
-                        this.notifications.success(this.intl.t('iam.controlles.users.index.user-changes-saved-success'));
+                        this.notifications.success(this.intl.t('iam.users.index.user-changes-saved-success'));
                         return this.hostRouter.refresh();
                     })
                     .catch((error) => {
@@ -351,16 +351,16 @@ export default class UsersIndexController extends Controller {
      */
     @action deleteUser(user) {
         if (user.id === this.currentUser.id) {
-            return this.notifications.error(this.intl.t('iam.controllers.users.index.error-you-cant-delete-yourself'));
+            return this.notifications.error(this.intl.t('iam.users.index.error-you-cant-delete-yourself'));
         }
 
         this.modalsManager.confirm({
-            title: `Delete ${user.get('name')} user`,
-            body: this.intl.t('iam.controllers.users.index.data-assosciated-user-delete'),
+            title: this.intl.t('iam.users.index.delete-user-title', {userName: user.get('name')}),
+            body: this.intl.t('iam.users.index.data-assosciated-user-delete'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.removeFromCurrentCompany().then(() => {
-                    this.notifications.success(`User (${user.get('name')}) deleted.`);
+                    this.notifications.success(this.intl.t('iam.users.index.delete-user-success-message', {userName: user.get('name')}));
                     this.hostRouter.refresh();
                 });
             },
@@ -374,12 +374,12 @@ export default class UsersIndexController extends Controller {
      */
     @action deactivateUser(user) {
         this.modalsManager.confirm({
-            title: `Deactivate ${user.get('name')} user's account`,
-            body: this.intl.t('iam.controllers.users.index.access-account-or-resources-unless-re-activated'),
+            title: this.intl.t('iam.users.index.deactivate-user-title', {userName: user.get('name')}),
+            body: this.intl.t('iam.users.index.access-account-or-resources-unless-re-activated'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.deactivate().then(() => {
-                    this.notifications.success(`User (${user.get('name')}) deactivated.`);
+                    this.notifications.success(this.intl.t('iam.users.index.deactivate-user-success-message', {userName: user.get('name')}));
                     this.hostRouter.refresh();
                 });
             },
@@ -393,12 +393,12 @@ export default class UsersIndexController extends Controller {
      */
     @action activateUser(user) {
         this.modalsManager.confirm({
-            title: `Re-activate ${user.get('name')} user's account`,
-            body: this.intl.t('iam.controllers.users.index.this-user-will-regain-access-to-your-organization'),
+            title: this.intl.t('iam.users.index.re-activate-user-title', {userName: user.get('name')}),
+            body: this.intl.t('iam.users.index.this-user-will-regain-access-to-your-organization'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.activate().then(() => {
-                    this.notifications.success(`User (${user.get('name')}) activated.`);
+                    this.notifications.success(this.intl.t('iam.users.index.re-activate-user-success-message', {userName: user.get('name')}));
                     this.hostRouter.refresh();
                 });
             },
@@ -412,12 +412,12 @@ export default class UsersIndexController extends Controller {
      */
     @action resendInvitation(user) {
         this.modalsManager.confirm({
-            title: this.intl.t('iam.controllers.users.index.resend-invitation-to-join-organization'),
-            body: this.intl.t('iam.controllers.users.index.confirming-fleetbase-will-re-send-invitation-for-user-to-join-your-organization'),
+            title: this.intl.t('iam.users.index.resend-invitation-to-join-organization'),
+            body: this.intl.t('iam.users.index.confirming-fleetbase-will-re-send-invitation-for-user-to-join-your-organization'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.resendInvite().then(() => {
-                    this.notifications.success(this.intl.t('iam.controllers.users.index.invitation-resent'));
+                    this.notifications.success(this.intl.t('iam.users.index.invitation-resent'));
                     this.hostRouter.refresh();
                 });
             },
diff --git a/addon/templates/policies/index.hbs b/addon/templates/policies/index.hbs
index 5cc6569..500ed63 100644
--- a/addon/templates/policies/index.hbs
+++ b/addon/templates/policies/index.hbs
@@ -1,4 +1,4 @@
-<Layout::Section::Header @title={{t "iam.templates.policies.policie"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+<Layout::Section::Header @title={{t "iam.policies.index.title"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
    {{#if (safe-has this.table "selectedRows")}}
         <DropdownButton @icon="layer-group" @text={{t "iam.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
@@ -10,7 +10,7 @@
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type={{t "iam.policies.common.primary"}} @text={{t "iam.policies.common.new"}} class="mr-2" @onClick={{this.createPolicy}} />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "iam.common.new"}} class="mr-2" @onClick={{this.createPolicy}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index ca61cda..d25d1e4 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -1,27 +1,27 @@
 iam:
   extension-name: IAM
-    common:
-      new: New
-      export: Export
-      bulk-action: Bulk Action
-      primary: primary
-      role: roles
-      user: Users
-      dashboard: Dashboard 
-      group: Groups
-      policie: Policies
-      member: Members
-      status: Status
-      address: Address
-      photo: photos
-      name: Name
-      email: Email
-      phone: Phone
-      country: Country
-      permission: Permission
-      description: Description
-      type: Type
-      create: Created
+  common:
+    address: Address
+    bulk-action: Bulk Action
+    country: Country
+    create: Created
+    dashboard: Dashboard 
+    description: Description
+    email: Email
+    export: Export
+    group: Groups
+    member: Members
+    name: Name
+    new: New
+    permission: Permission
+    phone: Phone
+    photo: photos
+    policie: Policies
+    primary: primary
+    role: Roles
+    status: Status
+    type: Type
+    user: Users
   components:
     modals:
       group-details:    
@@ -48,11 +48,16 @@ iam:
     table:
       group-members:
         no-member: No Members
-      permission-picker: 
-        search-permissions-keyword: Search permissions by keywords
-        loading-permission: Loading permissions...
+    permission-picker:
+      selected: >-
+        Selected: 
+      search-permissions-keyword: Search permissions by keywords
+      loading-permission: Loading permissions...
   groups:
     index:
+      untitled: Untitled
+      delete-group-title: Delete {groupName} group
+      delete-group-success-message: Group {name} deleted.
       delete-group: Delete Groups
       created: Created
       edit-group: Edit group...
@@ -64,18 +69,19 @@ iam:
       data-assosciated-this-group-deleted: Are you sure you want to delete this group? All data assosciated with this group will also be deleted. This action cannot be undone.
   policies:
     index:
+      title: Policies
       delete-policies: Delete Policies
       contact-action: Contact Actions
       edit-policy: Edit policy...
       delete-policy: Delete policy...
       new-policy: New Policy
       new-policy-created: New policy created.
-      unable-changes-policy-warning: Unable to make changes to a {policy.type} policy.
+      unable-changes-policy-warning: Unable to make changes to a {policyType} policy.
       edit-policy-title: Edit Policy
       changes-policy-saved-success: Changes to policy saved.
-      unable-delete-policy-warning: Unable to delete a {policy.type} policy.
+      unable-delete-policy-warning: Unable to delete a {policyType} policy.
       data-assosciated-this-policy-deleted: Are you sure you want to delete this policy? All data assosciated with this policy will also be deleted. This action cannot be undone.
-      policy-deleted: Policy {policy.name} deleted.
+      policy-deleted: Policy {policyName} deleted.
   roles:
     index:
       delete-roles: Delete Roles
@@ -87,9 +93,15 @@ iam:
       edit-role-title: Edit Role
       changes-role-saved: Changes to role saved.
       data-assosciated-this-role-deleted: Are you sure you want to delete this role? All data assosciated with this role will also be deleted. This action cannot be undone.
-      role-deleted: Role {role.name} deleted.
+      role-deleted: Role {roleName} deleted.
   users:
     index:
+      delete-user-title: Delete {userName} user
+      delete-user-success-message: User {userName} deleted.
+      deactivate-user-title: Deactivate {userName} user's account
+      deactivate-user-success-message: User {userName} deactivated.
+      re-activate-user-title: Re-activate {userName} user's account
+      re-activate-user-success-message: User {userName} activated.
       delete-users: Delete Users
       last-login: Last Login
       created-at: Created At
@@ -100,7 +112,6 @@ iam:
       deactivate-user: Deactivate user...
       activate-user: Activate user...
       delete-user: Delete user...
-      delete-users: Delete Users
       new-user: New User
       user-invited-join-your-organization-success: User has been invited to join your organization.
       edit-user-title: Edit User

From addaca9781c4f713d4c2fa12da2f7e3e9e80bb15 Mon Sep 17 00:00:00 2001
From: Munkh-erdene Damdinbazar <mmddd@Munkh-erdenes-MacBook-Pro.local>
Date: Wed, 24 Jan 2024 14:40:00 +0800
Subject: [PATCH 4/8] add lint and used lint

---
 addon/controllers/groups/index.js   |  4 ++--
 addon/controllers/policies/index.js |  6 +++---
 addon/controllers/roles/index.js    |  2 +-
 addon/controllers/users/index.js    | 12 ++++++------
 package.json                        |  2 ++
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addon/controllers/groups/index.js b/addon/controllers/groups/index.js
index 2eefe39..f5fc692 100644
--- a/addon/controllers/groups/index.js
+++ b/addon/controllers/groups/index.js
@@ -21,7 +21,7 @@ export default class GroupsIndexController extends Controller {
      * @var {Service}
      */
     @service store;
-   
+
     /**
      * Inject the `intl` service
      *
@@ -282,7 +282,7 @@ export default class GroupsIndexController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
                 return group.destroyRecord().then((group) => {
-                    this.notifications.success(this.intl.t('iam.groups.index.delete-group-success-message', {name: group.name }),);
+                    this.notifications.success(this.intl.t('iam.groups.index.delete-group-success-message', { name: group.name }));
                     this.hostRouter.refresh();
                 });
             },
diff --git a/addon/controllers/policies/index.js b/addon/controllers/policies/index.js
index f49679d..7f87959 100644
--- a/addon/controllers/policies/index.js
+++ b/addon/controllers/policies/index.js
@@ -228,7 +228,7 @@ export default class PoliciesIndexController extends Controller {
      */
     @action editPolicy(policy, options = {}) {
         if (!policy.is_mutable) {
-            return this.notifications.warning(this.intl.t('iam.policies.index.unable-changes-policy-warning', {policyType: policy.type}));
+            return this.notifications.warning(this.intl.t('iam.policies.index.unable-changes-policy-warning', { policyType: policy.type }));
         }
 
         this.modalsManager.show('modals/policy-form', {
@@ -252,7 +252,7 @@ export default class PoliciesIndexController extends Controller {
      */
     @action deletePolicy(policy) {
         if (!policy.is_deletable) {
-            return this.notifications.warning(this.intl.t('iam.policies.index.unable-delete-policy-warning', {policyType: policy.type}));
+            return this.notifications.warning(this.intl.t('iam.policies.index.unable-delete-policy-warning', { policyType: policy.type }));
         }
 
         this.modalsManager.confirm({
@@ -261,7 +261,7 @@ export default class PoliciesIndexController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
                 return policy.destroyRecord().then((policy) => {
-                    this.notifications.success(this.intl.t('iam.policies.index.policy-deleted', {policyName: policy.name}));
+                    this.notifications.success(this.intl.t('iam.policies.index.policy-deleted', { policyName: policy.name }));
                     return this.hostRouter.refresh();
                 });
             },
diff --git a/addon/controllers/roles/index.js b/addon/controllers/roles/index.js
index 993f596..b6e6139 100644
--- a/addon/controllers/roles/index.js
+++ b/addon/controllers/roles/index.js
@@ -247,7 +247,7 @@ export default class RolesIndexController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
                 return role.destroyRecord().then((role) => {
-                    this.notifications.success(this.intl.t('iam.roles.index.role-deleted', {roleName: role.name} ));
+                    this.notifications.success(this.intl.t('iam.roles.index.role-deleted', { roleName: role.name }));
                     return this.hostRouter.refresh();
                 });
             },
diff --git a/addon/controllers/users/index.js b/addon/controllers/users/index.js
index b679652..8e2a978 100644
--- a/addon/controllers/users/index.js
+++ b/addon/controllers/users/index.js
@@ -355,12 +355,12 @@ export default class UsersIndexController extends Controller {
         }
 
         this.modalsManager.confirm({
-            title: this.intl.t('iam.users.index.delete-user-title', {userName: user.get('name')}),
+            title: this.intl.t('iam.users.index.delete-user-title', { userName: user.get('name') }),
             body: this.intl.t('iam.users.index.data-assosciated-user-delete'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.removeFromCurrentCompany().then(() => {
-                    this.notifications.success(this.intl.t('iam.users.index.delete-user-success-message', {userName: user.get('name')}));
+                    this.notifications.success(this.intl.t('iam.users.index.delete-user-success-message', { userName: user.get('name') }));
                     this.hostRouter.refresh();
                 });
             },
@@ -374,12 +374,12 @@ export default class UsersIndexController extends Controller {
      */
     @action deactivateUser(user) {
         this.modalsManager.confirm({
-            title: this.intl.t('iam.users.index.deactivate-user-title', {userName: user.get('name')}),
+            title: this.intl.t('iam.users.index.deactivate-user-title', { userName: user.get('name') }),
             body: this.intl.t('iam.users.index.access-account-or-resources-unless-re-activated'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.deactivate().then(() => {
-                    this.notifications.success(this.intl.t('iam.users.index.deactivate-user-success-message', {userName: user.get('name')}));
+                    this.notifications.success(this.intl.t('iam.users.index.deactivate-user-success-message', { userName: user.get('name') }));
                     this.hostRouter.refresh();
                 });
             },
@@ -393,12 +393,12 @@ export default class UsersIndexController extends Controller {
      */
     @action activateUser(user) {
         this.modalsManager.confirm({
-            title: this.intl.t('iam.users.index.re-activate-user-title', {userName: user.get('name')}),
+            title: this.intl.t('iam.users.index.re-activate-user-title', { userName: user.get('name') }),
             body: this.intl.t('iam.users.index.this-user-will-regain-access-to-your-organization'),
             confirm: (modal) => {
                 modal.startLoading();
                 return user.activate().then(() => {
-                    this.notifications.success(this.intl.t('iam.users.index.re-activate-user-success-message', {userName: user.get('name')}));
+                    this.notifications.success(this.intl.t('iam.users.index.re-activate-user-success-message', { userName: user.get('name') }));
                     this.hostRouter.refresh();
                 });
             },
diff --git a/package.json b/package.json
index 8662978..79b780a 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
         "lint:hbs:fix": "ember-template-lint . --fix",
         "lint:js": "eslint . --cache",
         "lint:js:fix": "eslint . --fix",
+        "lint:intl": "fleetbase-intl-lint",
         "start": "ember serve",
         "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
         "test:ember": "ember test",
@@ -54,6 +55,7 @@
         "ember-wormhole": "^0.6.0"
     },
     "devDependencies": {
+        "@fleetbase/intl-lint": "^0.0.1",
         "@babel/eslint-parser": "^7.22.15",
         "@babel/plugin-proposal-decorators": "^7.23.2",
         "@ember/optional-features": "^2.0.0",

From 19c8e2d0df059723a3baf21f38d22fa4388d29d6 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 24 Jan 2024 15:02:39 +0800
Subject: [PATCH 5/8] preparing for new release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8662978..4b7e9ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/iam-engine",
-    "version": "0.0.8",
+    "version": "0.0.9",
     "description": "Fleetbase IAM extension provides identity and access management module for managing users, permissions and policies.",
     "fleetbase": {
         "route": "iam",

From 80e69db489d7c662f45e2262a7a0f47969fbd8b7 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 24 Jan 2024 15:06:20 +0800
Subject: [PATCH 6/8] updated workflow to include lint and updated lockfile

---
 .github/workflows/ci.yml |  3 +++
 pnpm-lock.yaml           | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8769d39..a17b741 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,9 @@ jobs:
     - name: Install Dependencies
       run: pnpm install
 
+    - name: Run lint
+      run: pnpm lint
+
     - name: Build
       run: pnpm run build
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 26d60fa..b5d1db6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -51,6 +51,9 @@ devDependencies:
   '@embroider/test-setup':
     specifier: ^3.0.2
     version: 3.0.2
+  '@fleetbase/intl-lint':
+    specifier: ^0.0.1
+    version: 0.0.1
   '@glimmer/component':
     specifier: ^1.1.2
     version: 1.1.2(@babel/core@7.23.2)
@@ -2456,6 +2459,14 @@ packages:
       - webpack-command
     dev: false
 
+  /@fleetbase/intl-lint@0.0.1:
+    resolution: {integrity: sha512-LkjxJr15hSiGmqh3JwixcpjmkhXNieNAEgQUVv1Duo50jTr/D5WXEyOaeI8wuVnVFhT+FS/DMqm403DgSKlsEg==}
+    hasBin: true
+    dependencies:
+      js-yaml: 4.1.0
+      yargs: 17.7.2
+    dev: true
+
   /@floating-ui/core@1.5.2:
     resolution: {integrity: sha512-Ii3MrfY/GAIN3OhXNzpCKaLxHQfJF9qvwq/kEJYdqDxeIHa01K8sldugal6TmeeXl+WMvhv9cnVzUTaFFJF09A==}
     dependencies:

From cd8679855d4cf24e79551e5b247a7c14096bf6c0 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 24 Jan 2024 15:36:45 +0800
Subject: [PATCH 7/8] upgrade core dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 669415c..fa2c3a6 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,8 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.1.9",
-        "@fleetbase/ember-ui": "^0.2.8",
+        "@fleetbase/ember-core": "^0.2.0",
+        "@fleetbase/ember-ui": "^0.2.9",
         "@babel/core": "^7.23.2",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",

From 157b58f9bfca26ea22b264067ee6c26ef7f09d5f Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 24 Jan 2024 15:39:25 +0800
Subject: [PATCH 8/8] updated lockfile

---
 pnpm-lock.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b5d1db6..c9e6e14 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,11 +5,11 @@ dependencies:
     specifier: ^7.23.2
     version: 7.23.2
   '@fleetbase/ember-core':
-    specifier: ^0.1.9
-    version: 0.1.9(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
+    specifier: ^0.2.0
+    version: 0.2.0(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0)
   '@fleetbase/ember-ui':
-    specifier: ^0.2.8
-    version: 0.2.8(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.32)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
+    specifier: ^0.2.9
+    version: 0.2.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.32)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0)
   '@fortawesome/ember-fontawesome':
     specifier: ^0.4.1
     version: 0.4.1(rollup@4.9.1)
@@ -2344,8 +2344,8 @@ packages:
       - supports-color
     dev: false
 
-  /@fleetbase/ember-core@0.1.9(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0):
-    resolution: {integrity: sha512-DoOCjua2iNpXVLC1NANncSNgITfV1TWJN3DQEqGYyEpBGn3shBklt1b86xKqf1fkX71dApEqX2UxyBDvj5lnlQ==}
+  /@fleetbase/ember-core@0.2.0(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0):
+    resolution: {integrity: sha512-J7Heq2dfw++16+KmzvSHEP2kzACDEkO0mJk0YBay47ghF9R/jK1if1s90XPHCEAJZ2LwYYrqsyhWukdJF57omA==}
     engines: {node: '>= 18'}
     dependencies:
       '@babel/core': 7.23.2
@@ -2376,8 +2376,8 @@ packages:
       - webpack
     dev: false
 
-  /@fleetbase/ember-ui@0.2.8(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.32)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0):
-    resolution: {integrity: sha512-3WwGllSGCz4i1pIGK8vhkYKEjQktZXbDnUNrq434g3RFHpsYnXCSZBe8NmMauk3XUP6E4Ku6/u5dQvyByg1pFQ==}
+  /@fleetbase/ember-ui@0.2.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.32)(rollup@4.9.1)(tracked-built-ins@3.3.0)(webpack@5.89.0):
+    resolution: {integrity: sha512-j/vdIJbyeyzrEs3QfZ3ZbhxU6ZT4nLWCXpAPIugnyrHLt72pwBR71gWq5YNUW33JkyhB//aNAQFGhBGg5ASbzg==}
     engines: {node: '>= 18'}
     dependencies:
       '@babel/core': 7.23.2