Merge pull request #4253 from pavinduLakshan/is_17017

Fix incorrect i18n keys in assigned groups UI in roles section
wso2 · Oct 20, 2023 · f1e3e58 · f1e3e58
2 parents 0fcaa83 + 84f4f91
commit f1e3e58
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/.changeset/great-laws-doubt.md b/.changeset/great-laws-doubt.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/console": patch
+---
+
+Fix incorrect i18n keys in assigned groups UI in roles section
diff --git a/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx b/apps/console/src/extensions/components/roles/components/edit-role/edit-role-groups.tsx
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2021-2023, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -729,7 +729,7 @@ export const RoleGroupsList: FunctionComponent<RoleGroupsPropsInterface> = (
                                 <EmphasizedSegment>
                                     <EmptyPlaceholder
                                         data-testid="role-mgt-empty-groups-list"
-                                        title={ t("console:manage.features.roles.edit.groups." +
+                                        title={ t("console:manage.features.roles.edit.groups.placeholders." +
                                             "emptyPlaceholder.title") }
                                         subtitle={ [
                                             t("console:manage.features.roles.edit.groups." +
@@ -742,7 +742,7 @@ export const RoleGroupsList: FunctionComponent<RoleGroupsPropsInterface> = (
                                                     icon="plus"
                                                     onClick={ handleOpenAddNewGroupModal }
                                                 >
-                                                    { t("console:manage.features.roles.edit.groups." +
+                                                    { t("console:manage.features.roles.edit.groups.placeholders." +
                                                         "emptyPlaceholder.action") }
                                                 </PrimaryButton>
                                             )

diff --git a/...src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx b/...src/features/organizations/components/edit-organization-role/edit-organization-groups.tsx
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2022, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2022-2023, WSO2 LLC. (https://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -686,10 +686,10 @@ export const RoleGroupsList: FunctionComponent<RoleGroupsPropsInterface> = (
                                         <EmphasizedSegment>
                                             <EmptyPlaceholder
                                                 data-testid="role-mgt-empty-groups-list"
-                                                title={ t("console:manage.features.roles.edit.groups." +
+                                                title={ t("console:manage.features.roles.edit.groups.placeholders." +
                                                         "emptyPlaceholder.title") }
                                                 subtitle={ [
-                                                    t("console:manage.features.roles.edit.groups." +
+                                                    t("console:manage.features.roles.edit.groups.placeholders." +
                                                             "emptyPlaceholder.subtitles")
                                                 ] }
                                                 action={
@@ -700,7 +700,7 @@ export const RoleGroupsList: FunctionComponent<RoleGroupsPropsInterface> = (
                                                             onClick={ handleOpenAddNewGroupModal }
                                                         >
                                                             { t("console:manage.features.roles.edit.groups." +
-                                                                    "emptyPlaceholder.action") }
+                                                                    "placeholders.emptyPlaceholder.action") }
                                                         </PrimaryButton>
                                                     )
                                                 }

diff --git a/apps/console/src/features/roles/components/edit-role/edit-role-groups.tsx b/apps/console/src/features/roles/components/edit-role/edit-role-groups.tsx
@@ -742,11 +742,11 @@ export const RoleGroupsList: FunctionComponent<RoleGroupsPropsInterface> = (
                                         <EmphasizedSegment>
                                             <EmptyPlaceholder
                                                 data-testid="role-mgt-empty-groups-list"
-                                                title={ t("console:manage.features.roles.edit.groups." +
+                                                title={ t("console:manage.features.roles.edit.groups.placeholders." +
                                                         "emptyPlaceholder.title") }
                                                 subtitle={ [
-                                                    t("console:manage.features.roles.edit.groups." +
-                                                            "emptyPlaceholder.subtitles")
+                                                    t("console:manage.features.roles.edit.groups.placeholders." +
+                                                            "emptyPlaceholder.subtitles.0")
                                                 ] }
                                                 action={
                                                     !isReadOnly && (
@@ -756,7 +756,7 @@ export const RoleGroupsList: FunctionComponent<RoleGroupsPropsInterface> = (
                                                             onClick={ handleOpenAddNewGroupModal }
                                                         >
                                                             { t("console:manage.features.roles.edit.groups." +
-                                                                    "emptyPlaceholder.action") }
+                                                                    "placeholders.emptyPlaceholder.action") }
                                                         </PrimaryButton>
                                                     )
                                                 }