From e67067c5840b814c708ba2ed5bdf4936ad91c013 Mon Sep 17 00:00:00 2001 From: vincentbpro <89356961+vincentbpro@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:25:43 +0100 Subject: [PATCH 1/3] merged duplicated tranlations using the interactive script --- .../components/AuthenticatedApp/utils/api.js | 2 +- .../Blocker.js | 2 +- .../admin/src/components/LeftMenu/index.js | 4 +- .../DynamicTable/TableRows/index.js | 2 +- .../components/SelectMany/index.js | 2 +- .../components/SelectOne/index.js | 2 +- .../components/FieldButtonContent.js | 2 +- .../EditSettingsView/components/FormModal.js | 2 +- .../pages/EditSettingsView/index.js | 4 +- .../pages/EditView/Header/index.js | 2 +- .../components/EditFieldForm.js | 2 +- .../pages/ListSettingsView/index.js | 4 +- .../content-manager/pages/ListView/index.js | 7 +- .../admin/admin/src/hooks/useMenu/reducer.js | 6 +- .../src/hooks/useReleaseNotification/index.js | 2 +- .../admin/src/hooks/useSettingsMenu/init.js | 4 +- .../admin/src/pages/Admin/Onboarding/index.js | 2 +- .../AuthPage/components/Login/BaseLogin.js | 2 +- .../AuthPage/components/Register/index.js | 2 +- .../components/ResetPassword/index.js | 6 +- .../admin/src/pages/HomePage/ContentBlocks.js | 2 +- .../src/pages/InstalledPluginsPage/Plugins.js | 6 +- .../src/pages/InstalledPluginsPage/index.js | 2 +- .../admin/src/pages/MarketplacePage/index.js | 2 +- .../admin/src/pages/ProfilePage/index.js | 10 +- .../components/SettingsNav/index.js | 2 +- .../SettingsNav/tests/index.test.js | 2 +- .../admin/src/pages/SettingsPage/index.js | 2 +- .../EditView/components/LoadingView/index.js | 2 +- .../pages/ApiTokens/EditView/index.js | 6 +- .../DynamicTable/DeleteButton/index.js | 2 +- .../pages/ApplicationInfosPage/index.js | 2 +- .../components/ConditionsButton/index.js | 2 +- .../EditPage/components/RoleForm/index.js | 6 +- .../pages/Roles/EditPage/index.js | 4 +- .../pages/Roles/ListPage/index.js | 12 +-- .../pages/Users/EditPage/index.js | 10 +- .../pages/Users/EditPage/utils/layout.js | 2 +- .../ListPage/DynamicTable/TableRows/index.js | 2 +- .../pages/Users/ListPage/ModalForm/index.js | 2 +- .../Users/ListPage/ModalForm/utils/stepper.js | 2 +- .../pages/Users/ListPage/index.js | 2 +- .../EditView/components/WebhookForm/index.js | 6 +- .../pages/Webhooks/ListView/index.js | 14 +-- .../pages/SettingsPage/tests/index.test.js | 4 +- .../admin/src/pages/UseCasePage/index.js | 4 +- .../core/admin/admin/src/translations/en.json | 93 +++++++------------ .../components/Providers/SSOProviders.js | 2 +- .../pages/SettingsPage/SingleSignOn/index.js | 4 +- .../pages/Roles/CreatePage/index.js | 10 +- .../pages/Roles/ListPage/index.js | 12 +-- .../components/AllowedTypesSelect/index.js | 3 +- .../FormModal/attributes/advancedForm.js | 30 +++--- .../FormModal/attributes/baseForm.js | 12 +-- .../FormModal/attributes/nameField.js | 2 +- .../src/components/FormModal/category/form.js | 2 +- .../FormModal/component/componentField.js | 2 +- .../components/FormModal/contentType/form.js | 2 +- .../src/components/FormModal/forms/index.js | 3 +- .../components/FormModalEndActions/index.js | 26 +++--- .../admin/src/components/List/index.js | 12 +-- .../admin/src/components/ListRow/index.js | 2 +- .../admin/src/pages/ListView/index.js | 4 +- .../admin/src/translations/en.json | 13 +-- .../ConfirmDialog/tests/index.test.js | 2 +- .../DynamicTable/TableHead/index.js | 4 +- .../lib/src/components/DynamicTable/index.js | 2 +- .../GenericInput/storyUtils/layout.js | 2 +- .../components/AssetDialog/DialogFooter.js | 2 +- .../EditAssetDialog/PreviewBox/index.js | 2 +- .../src/components/EditAssetDialog/index.js | 4 +- .../Carousel/CarouselAssetActions.js | 2 +- .../pages/App/components/BulkDeleteButton.js | 2 +- .../admin/src/pages/SettingsPage/index.js | 2 +- .../upload/admin/src/translations/en.json | 2 - .../admin/src/pages/PluginPage/index.js | 2 +- .../admin/src/pages/SettingsPage/index.js | 4 +- .../admin/src/translations/en.json | 3 - .../admin/src/components/ModalCreate/index.js | 2 +- .../admin/src/components/ModalEdit/index.js | 2 +- .../admin/src/components/FormModal/index.js | 2 +- .../users-permissions/admin/src/index.js | 2 +- .../admin/src/pages/AdvancedSettings/index.js | 4 +- .../EmailTemplates/components/EmailTable.js | 4 +- .../admin/src/pages/Providers/index.js | 8 +- .../admin/src/pages/Roles/CreatePage/index.js | 6 +- .../admin/src/pages/Roles/EditPage/index.js | 8 +- .../Roles/ListPage/components/TableBody.js | 5 +- .../admin/src/pages/Roles/ListPage/index.js | 12 +-- .../admin/src/translations/en.json | 11 --- 90 files changed, 227 insertions(+), 281 deletions(-) diff --git a/packages/core/admin/admin/src/components/AuthenticatedApp/utils/api.js b/packages/core/admin/admin/src/components/AuthenticatedApp/utils/api.js index d43f51439b1..fab32081617 100644 --- a/packages/core/admin/admin/src/components/AuthenticatedApp/utils/api.js +++ b/packages/core/admin/admin/src/components/AuthenticatedApp/utils/api.js @@ -21,7 +21,7 @@ const fetchStrapiLatestRelease = async toggleNotification => { link: { url: `https://github.com/strapi/strapi/releases/tag/${tag_name}`, label: { - id: 'notification.version.update.link', + id: 'global.see-more', }, }, blockTransition: true, diff --git a/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js b/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js index 37b02a41243..99b84c7a696 100644 --- a/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js +++ b/packages/core/admin/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js @@ -78,7 +78,7 @@ const Blocker = ({ displayedIcon, description, title, isOpen }) => { rel="noopener noreferrer nofollow" > {formatMessage({ - id: 'app.components.BlockLink.documentation', + id: 'global.documentation', defaultMessage: 'Read the documentation', })} diff --git a/packages/core/admin/admin/src/components/LeftMenu/index.js b/packages/core/admin/admin/src/components/LeftMenu/index.js index 67ea60a6fbd..cd7be6e14c3 100644 --- a/packages/core/admin/admin/src/components/LeftMenu/index.js +++ b/packages/core/admin/admin/src/components/LeftMenu/index.js @@ -100,7 +100,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => { }> - {formatMessage({ id: 'content-manager.plugin.name', defaultMessage: 'Content manager' })} + {formatMessage({ id: 'global.content-manager', defaultMessage: 'Content manager' })} {pluginsSectionLinks.length > 0 ? ( @@ -160,7 +160,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => { {formatMessage({ - id: 'app.components.LeftMenu.profile', + id: 'global.profile', defaultMessage: 'Profile', })} diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js index db0721b154b..0e37acdd4f1 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/TableRows/index.js @@ -148,7 +148,7 @@ const TableRows = ({ onClickDelete(data.id); }} label={formatMessage( - { id: 'app.component.table.delete', defaultMessage: 'Delete {target}' }, + { id: 'global.delete-target', defaultMessage: 'Delete {target}' }, { target: itemLineText } )} noBorder diff --git a/packages/core/admin/admin/src/content-manager/components/SelectMany/index.js b/packages/core/admin/admin/src/content-manager/components/SelectMany/index.js index adb8eb6a4cf..283b8fd7b87 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectMany/index.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectMany/index.js @@ -70,7 +70,7 @@ function SelectMany({ onMenuOpen={onMenuOpen} onMenuScrollToBottom={onMenuScrollToBottom} placeholder={formatMessage( - placeholder || { id: 'components.Select.placeholder', defaultMessage: 'Select...' } + placeholder || { id: 'global.select', defaultMessage: 'Select...' } )} styles={styles} value={[]} diff --git a/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js b/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js index 83814a8d9ad..3772d1a9a7a 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js @@ -46,7 +46,7 @@ function SelectOne({ onMenuOpen={onMenuOpen} onMenuScrollToBottom={onMenuScrollToBottom} placeholder={formatMessage( - placeholder || { id: 'components.Select.placeholder', defaultMessage: 'Select...' } + placeholder || { id: 'global.select', defaultMessage: 'Select...' } )} styles={styles} value={isNull(value) ? null : { label: get(value, [mainField.name], ''), value }} diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js index bf7bff4f650..583a459fea3 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/FieldButtonContent.js @@ -44,7 +44,7 @@ const FieldButtonContent = ({ attribute, onEditField, onDeleteField, children }) } endActions={ } /> diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js index 85c5ed5bcc1..f3107fa8cc6 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/index.js @@ -250,7 +250,7 @@ const EditSettingsView = ({ mainLayout, components, isContentTypeView, slug, upd to="/" > {formatMessage({ - id: 'app.components.go-back', + id: 'global.back', defaultMessage: 'Back', })} @@ -261,7 +261,7 @@ const EditSettingsView = ({ mainLayout, components, isContentTypeView, slug, upd startIcon={} type="submit" > - {formatMessage({ id: 'form.button.save', defaultMessage: 'Save' })} + {formatMessage({ id: 'global.save', defaultMessage: 'Save' })} } /> diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js index 87f7a2dc5bf..e2388cdbf97 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/Header/index.js @@ -172,7 +172,7 @@ const Header = ({ to="/" > {formatMessage({ - id: 'app.components.HeaderLayout.link.go-back', + id: 'global.back', defaultMessage: 'Back', })} diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js index 8e42e6ed8b8..7be70bd6f41 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/components/EditFieldForm.js @@ -113,7 +113,7 @@ const EditFieldForm = ({ } endActions={ } /> diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js index 6b2717d6cbe..b6691c3b793 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js @@ -191,7 +191,7 @@ const ListSettingsView = ({ layout, slug }) => { } to={goBackUrl} id="go-back"> - {formatMessage({ id: 'app.components.go-back', defaultMessage: 'Back' })} + {formatMessage({ id: 'global.back', defaultMessage: 'Back' })} } primaryAction={ @@ -201,7 +201,7 @@ const ListSettingsView = ({ layout, slug }) => { disabled={isEqual(modifiedData, initialData)} type="submit" > - {formatMessage({ id: 'form.button.save', defaultMessage: 'Save' })} + {formatMessage({ id: 'global.save', defaultMessage: 'Save' })} } subtitle={formatMessage({ diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js index 4e785f5c2c8..02a5b75d993 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js @@ -267,7 +267,7 @@ function ListView({ navigationAction={ } to="/content-manager/"> {formatMessage({ - id: 'app.components.HeaderLayout.link.go-back', + id: 'global.back', defaultMessage: 'Back', })} @@ -388,9 +388,6 @@ export function mapDispatchToProps(dispatch) { dispatch ); } -const withConnect = connect( - mapStateToProps, - mapDispatchToProps -); +const withConnect = connect(mapStateToProps, mapDispatchToProps); export default compose(withConnect)(memo(ListView, isEqual)); diff --git a/packages/core/admin/admin/src/hooks/useMenu/reducer.js b/packages/core/admin/admin/src/hooks/useMenu/reducer.js index a26ee0266bc..f697d3d366e 100644 --- a/packages/core/admin/admin/src/hooks/useMenu/reducer.js +++ b/packages/core/admin/admin/src/hooks/useMenu/reducer.js @@ -10,7 +10,7 @@ const initialState = { { icon: Puzzle, intlLabel: { - id: 'app.components.LeftMenuLinkContainer.listPlugins', + id: 'global.plugins', defaultMessage: 'Plugins', }, to: '/list-plugins', @@ -19,7 +19,7 @@ const initialState = { { icon: ShoppingCart, intlLabel: { - id: 'app.components.LeftMenuLinkContainer.installNewPlugin', + id: 'global.marketplace', defaultMessage: 'Marketplace', }, to: '/marketplace', @@ -28,7 +28,7 @@ const initialState = { { icon: Cog, intlLabel: { - id: 'app.components.LeftMenuLinkContainer.settings', + id: 'global.settings', defaultMessage: 'Settings', }, to: '/settings', diff --git a/packages/core/admin/admin/src/hooks/useReleaseNotification/index.js b/packages/core/admin/admin/src/hooks/useReleaseNotification/index.js index 338c7b6b00c..556e42f1cd6 100644 --- a/packages/core/admin/admin/src/hooks/useReleaseNotification/index.js +++ b/packages/core/admin/admin/src/hooks/useReleaseNotification/index.js @@ -15,7 +15,7 @@ const useReleaseNotification = () => { link: { url: `https://github.com/strapi/strapi/releases/tag/${latestStrapiReleaseTag}`, label: { - id: 'notification.version.update.link', + id: 'global.see-more', }, }, blockTransition: true, diff --git a/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js b/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js index ba7b0b8a670..451704ab22d 100644 --- a/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js +++ b/packages/core/admin/admin/src/hooks/useSettingsMenu/init.js @@ -25,14 +25,14 @@ const init = (initialState, { settings, shouldUpdateStrapi }) => { intlLabel: { id: 'Settings.permissions', defaultMessage: 'Administration Panel' }, links: [ { - intlLabel: { id: 'Settings.permissions.menu.link.roles.label', defaultMessage: 'Roles' }, + intlLabel: { id: 'global.roles', defaultMessage: 'Roles' }, to: '/settings/roles', id: 'roles', isDisplayed: false, permissions: adminPermissions.settings.roles.main, }, { - intlLabel: { id: 'Settings.permissions.menu.link.users.label' }, + intlLabel: { id: 'global.users' }, // Init the search params directly to: '/settings/users?pageSize=10&page=1&sort=firstname', id: 'users', diff --git a/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js b/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js index f107e35d8ae..6170495549c 100644 --- a/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js +++ b/packages/core/admin/admin/src/pages/Admin/Onboarding/index.js @@ -75,7 +75,7 @@ const Onboarding = () => { { icon: 'book', label: formatMessage({ - id: 'app.components.LeftMenuFooter.documentation', + id: 'global.documentation', defaultMessage: 'Documentation', }), destination: 'https://docs.strapi.io', diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js b/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js index 251f79d6d5f..63259a76e90 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Login/BaseLogin.js @@ -107,7 +107,7 @@ const Login = ({ onSubmit, schema, children }) => { onChange={handleChange} value={values.password} label={formatMessage({ - id: 'Auth.form.password.label', + id: 'global.password', defaultMessage: 'Password', })} name="password" diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js index fbe2339f6ca..c32540f6053 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js @@ -231,7 +231,7 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) => })} required label={formatMessage({ - id: 'Auth.form.password.label', + id: 'global.password', defaultMessage: 'Password', })} type={passwordShown ? 'text' : 'password'} diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js index 65ba1aa84e7..16dee73ef02 100644 --- a/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js +++ b/packages/core/admin/admin/src/pages/AuthPage/components/ResetPassword/index.js @@ -53,7 +53,7 @@ const ForgotPassword = ({ onSubmit, schema }) => { {formatMessage({ - id: 'Auth.reset-password.title', + id: 'global.reset-password', defaultMessage: 'Reset password', })} @@ -114,7 +114,7 @@ const ForgotPassword = ({ onSubmit, schema }) => { })} required label={formatMessage({ - id: 'Auth.form.password.label', + id: 'global.password', defaultMessage: 'Password', })} type={passwordShown ? 'text' : 'password'} @@ -161,7 +161,7 @@ const ForgotPassword = ({ onSubmit, schema }) => { /> diff --git a/packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js b/packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js index 943b88ab404..4da6916efe2 100644 --- a/packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js +++ b/packages/core/admin/admin/src/pages/HomePage/ContentBlocks.js @@ -24,7 +24,7 @@ const ContentBlocks = () => { > { const toggleNotification = useNotification(); const title = formatMessage({ - id: 'app.components.ListPluginsPage.title', + id: 'global.plugins', defaultMessage: 'Plugins', }); @@ -70,7 +70,7 @@ const Plugins = () => { {formatMessage({ - id: 'Settings.roles.list.header.name', + id: 'global.name', defaultMessage: 'Name', })} @@ -78,7 +78,7 @@ const Plugins = () => { {formatMessage({ - id: 'Settings.roles.list.header.description', + id: 'global.description', defaultMessage: 'description', })} diff --git a/packages/core/admin/admin/src/pages/InstalledPluginsPage/index.js b/packages/core/admin/admin/src/pages/InstalledPluginsPage/index.js index 50bbeff20d0..5a9932b3495 100644 --- a/packages/core/admin/admin/src/pages/InstalledPluginsPage/index.js +++ b/packages/core/admin/admin/src/pages/InstalledPluginsPage/index.js @@ -8,7 +8,7 @@ import Plugins from './Plugins'; const InstalledPluginsPage = () => { const { formatMessage } = useIntl(); const title = formatMessage({ - id: 'app.components.ListPluginsPage.title', + id: 'global.plugins', defaultMessage: 'Plugins', }); diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/index.js index bcd541663ab..07cbea2f4b9 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/index.js @@ -46,7 +46,7 @@ const MarketPlacePage = () => { /> { title={data.username || getFullName(data.firstname, data.lastname)} primaryAction={ } /> @@ -195,7 +195,7 @@ const ProfilePage = () => { {formatMessage({ - id: 'Settings.profile.form.section.profile.title', + id: 'global.profile', defaultMessage: 'Profile', })} @@ -266,7 +266,7 @@ const ProfilePage = () => { {formatMessage({ - id: 'Settings.profile.form.section.password.title', + id: 'global.change-password', defaultMessage: 'Change password', })} @@ -329,7 +329,7 @@ const ProfilePage = () => { onChange={handleChange} value={values.password || ''} label={formatMessage({ - id: 'Auth.form.password.label', + id: 'global.password', defaultMessage: 'Password', })} name="password" @@ -451,7 +451,7 @@ const ProfilePage = () => { defaultMessage: 'Interface language', })} placeholder={formatMessage({ - id: 'components.Select.placeholder', + id: 'global.select', defaultMessage: 'Select', })} hint={formatMessage({ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js index 982d6098e63..307363d8c5f 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/index.js @@ -30,7 +30,7 @@ const SettingsNav = ({ menu }) => { }); const label = formatMessage({ - id: 'app.components.LeftMenuLinkContainer.settings', + id: 'global.settings', defaultMessage: 'Settings', }); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js index 05b8919e085..ab0e13c96a0 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js @@ -26,7 +26,7 @@ const menu = [ intlLabel: { id: 'Settings.permissions', defaultMessage: 'Administration Panel' }, links: [ { - intlLabel: { id: 'Settings.permissions.menu.link.roles.label', defaultMessage: 'Roles' }, + intlLabel: { id: 'global.roles', defaultMessage: 'Roles' }, to: '/settings/roles', id: 'roles', isDisplayed: true, diff --git a/packages/core/admin/admin/src/pages/SettingsPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/index.js index 68a33faf76f..35a48d5be74 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/index.js @@ -47,7 +47,7 @@ function SettingsPage() { } const settingTitle = formatMessage({ - id: 'app.components.LeftMenuLinkContainer.settings', + id: 'global.settings', defaultMessage: 'Settings', }); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js index 0652c02e8b6..3cc7fe1fff0 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/LoadingView/index.js @@ -21,7 +21,7 @@ const LoadingView = ({ apiTokenName }) => { } type="button" size="L"> - {formatMessage({ id: 'form.button.save', defaultMessage: 'Save' })} + {formatMessage({ id: 'global.save', defaultMessage: 'Save' })} } title={ diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js index 5ab0cfa3df3..d793f04bba9 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js @@ -159,7 +159,7 @@ const ApiTokenCreateView = () => { size="L" > {formatMessage({ - id: 'app.components.Button.save', + id: 'global.save', defaultMessage: 'Save', })} @@ -167,7 +167,7 @@ const ApiTokenCreateView = () => { navigationAction={ } to="/settings/api-tokens"> {formatMessage({ - id: 'app.components.go-back', + id: 'global.back', defaultMessage: 'Back', })} @@ -188,7 +188,7 @@ const ApiTokenCreateView = () => { {formatMessage({ - id: 'Settings.apiTokens.details', + id: 'global.details', defaultMessage: 'Details', })} diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DeleteButton/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DeleteButton/index.js index 9e7b406004e..2ed062fbfa4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DeleteButton/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/DynamicTable/DeleteButton/index.js @@ -19,7 +19,7 @@ const DeleteButton = ({ tokenName, onClickDelete }) => { }} label={formatMessage( { - id: 'app.component.table.delete', + id: 'global.delete-target', defaultMessage: 'Delete {target}', }, { target: `${tokenName}` } diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js index 1eef64c8b8f..fbf83cc2765 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/index.js @@ -45,7 +45,7 @@ const ApplicationInfosPage = () => { {formatMessage({ - id: 'Settings.application.details', + id: 'global.details', defaultMessage: 'Details', })} diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js index b640e5a9849..d3b997e79e2 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsButton/index.js @@ -31,7 +31,7 @@ const ConditionsButton = ({ onClick, className, hasConditions, variant }) => { diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RoleForm/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RoleForm/index.js index f7db644bad6..779672818f9 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RoleForm/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/RoleForm/index.js @@ -24,7 +24,7 @@ const RoleForm = ({ disabled, role, values, errors, onChange, onBlur }) => { {role ? role.name : formatMessage({ - id: 'Settings.roles.form.title', + id: 'global.details', defaultMessage: 'Details', })} @@ -58,7 +58,7 @@ const RoleForm = ({ disabled, role, values, errors, onChange, onBlur }) => { name="name" error={errors.name && formatMessage({ id: errors.name })} label={formatMessage({ - id: 'Settings.roles.form.input.name', + id: 'global.name', defaultMessage: 'Name', })} onChange={onChange} @@ -70,7 +70,7 @@ const RoleForm = ({ disabled, role, values, errors, onChange, onBlur }) => {