diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsButton/index.js b/packages/core/admin/admin/src/components/Roles/ConditionsButton/index.js
index a445371892..d4707d383c 100644
--- a/packages/core/admin/admin/src/components/Roles/ConditionsButton/index.js
+++ b/packages/core/admin/admin/src/components/Roles/ConditionsButton/index.js
@@ -30,7 +30,10 @@ const ConditionsButton = ({ onClick, className, hasConditions, variant }) => {
return (
} onClick={onClick}>
- {formatMessage({ id: 'app.components.LeftMenuLinkContainer.settings' })}
+ {formatMessage({
+ id: 'app.components.LeftMenuLinkContainer.settings',
+ defaultMessage: 'Settings',
+ })}
);
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js b/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
index c630abf8bc..d5bf2b322b 100644
--- a/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
+++ b/packages/core/admin/admin/src/components/Roles/ConditionsModal/ActionRow/index.js
@@ -28,6 +28,7 @@ const ActionRow = ({
{formatMessage({
id: 'Settings.permissions.conditions.can',
+ defaultMessage: 'Can',
})}
@@ -41,6 +42,7 @@ const ActionRow = ({
{formatMessage({
id: 'Settings.permissions.conditions.when',
+ defaultMessage: 'When',
})}
diff --git a/packages/core/admin/admin/src/components/Roles/ConditionsModal/index.js b/packages/core/admin/admin/src/components/Roles/ConditionsModal/index.js
index b5d383535c..1a17028c20 100644
--- a/packages/core/admin/admin/src/components/Roles/ConditionsModal/index.js
+++ b/packages/core/admin/admin/src/components/Roles/ConditionsModal/index.js
@@ -118,16 +118,14 @@ const ConditionsModal = ({
const shouldDisplayChevron = index < translatedHeaders.length - 1;
return (
- <>
-
- {element}
-
+
+ {element}
{shouldDisplayChevron && (
)}
- >
+
);
})}
@@ -137,12 +135,19 @@ const ConditionsModal = ({
{formatMessage({
id: 'Settings.permissions.conditions.define-conditions',
+ defaultMessage: 'Define conditions',
})}
{actionsToDisplay.length === 0 && (
- {formatMessage({ id: 'Settings.permissions.conditions.no-actions' })}
+
+ {formatMessage({
+ id: 'Settings.permissions.conditions.no-actions',
+ defaultMessage:
+ 'You first need to select actions (create, read, update, ...) before defining conditions on them.',
+ })}
+
)}
{actionsToDisplay.map(({ actionId, label, pathToConditionsObject }, index) => {
const name = pathToConditionsObject.join('..');
@@ -167,13 +172,14 @@ const ConditionsModal = ({
- {formatMessage({ id: 'app.components.Button.cancel' })}
+ {formatMessage({ id: 'app.components.Button.cancel', defaultMessage: 'Cancel' })}
}
endActions={
}
diff --git a/packages/core/admin/admin/src/components/Roles/Permissions/index.js b/packages/core/admin/admin/src/components/Roles/Permissions/index.js
index 31ebec6c94..ea61812c13 100644
--- a/packages/core/admin/admin/src/components/Roles/Permissions/index.js
+++ b/packages/core/admin/admin/src/components/Roles/Permissions/index.js
@@ -111,7 +111,9 @@ const Permissions = forwardRef(({ layout, isFormDisabled, permissions }, ref) =>
{TAB_LABELS.map(tabLabel => (
- {formatMessage({ id: tabLabel.labelId })}
+
+ {formatMessage({ id: tabLabel.labelId, defaultMessage: tabLabel.defaultMessage })}
+
))}
diff --git a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js b/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js
index 6691930cd0..21fe6c6781 100644
--- a/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js
+++ b/packages/core/admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js
@@ -91,7 +91,7 @@ const SubCategory = ({ categoryName, isFormDisabled, subCategoryName, actions, p
indeterminate={hasSomeActionsSelected}
value={hasAllActionsSelected}
>
- {formatMessage({ id: 'app.utils.select-all' })}
+ {formatMessage({ id: 'app.utils.select-all', defaultMessage: 'Select all' })}
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/index.js
index f8de4f935d..9c90603e82 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/index.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/index.js
@@ -63,7 +63,10 @@ function SettingsPage() {
return ;
}
- const settingTitle = formatMessage({ id: 'app.components.LeftMenuLinkContainer.settings' });
+ const settingTitle = formatMessage({
+ id: 'app.components.LeftMenuLinkContainer.settings',
+ defaultMessage: 'Settings',
+ });
return (
diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json
index ad711b8120..931921fa9d 100644
--- a/packages/core/admin/admin/src/translations/en.json
+++ b/packages/core/admin/admin/src/translations/en.json
@@ -127,7 +127,7 @@
"Settings.roles.create.title": "Create a role",
"Settings.roles.created": "Role created",
"Settings.roles.edit.title": "Edit a role",
- "Settings.roles.form.button.users-with-role": "{number} users with this role",
+ "Settings.roles.form.button.users-with-role": "{number, plural, =0 {# users} one {# user} other {# users}} with this role",
"Settings.roles.form.created": "Created",
"Settings.roles.form.description": "Name and description of the role",
"Settings.roles.form.input.description": "Description",
diff --git a/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js b/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
index 2029aa9472..ae5104fb2a 100644
--- a/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
+++ b/packages/core/admin/ee/admin/pages/Roles/CreatePage/index.js
@@ -169,6 +169,7 @@ const CreatePage = () => {
{formatMessage({
id: 'Settings.roles.form.title',
+ defaultMessage: 'Details',
})}
@@ -176,6 +177,7 @@ const CreatePage = () => {
{formatMessage({
id: 'Settings.roles.form.description',
+ defaultMessage: 'Name and description of the role',
})}
@@ -184,6 +186,8 @@ const CreatePage = () => {
{formatMessage(
{
id: 'Settings.roles.form.button.users-with-role',
+ defaultMessage:
+ '{number, plural, =0 {# users} one {# user} other {# users}} with this role',
},
{ number: 0 }
)}
@@ -194,7 +198,10 @@ const CreatePage = () => {
{
', () => {
+ it('renders and matches the snapshot', () => {
+ const {
+ container: { firstChild },
+ } = render();
+
+ expect(firstChild).toMatchInlineSnapshot();
+ });
+});