From 6db4e0c0f32b0809b7c936625a7941d3eb1ce167 Mon Sep 17 00:00:00 2001
From: soupette <cyril.lpz@gmail.com>
Date: Tue, 30 Mar 2021 09:08:44 +0200
Subject: [PATCH] Change settings confirm modal type & change copy locale
 submit button label

Signed-off-by: soupette <cyril.lpz@gmail.com>
---
 .../admin/src/components/SettingsViewWrapper/index.js    | 9 +++++----
 .../admin/src/components/CMEditViewCopyLocale/index.js   | 3 ++-
 .../strapi-plugin-i18n/admin/src/translations/en.json    | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js
index 8c5297c98a..a6b111760c 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js
@@ -7,6 +7,7 @@ import { Inputs as Input, Header } from '@buffetjs/custom';
 import {
   BackHeader,
   LoadingIndicatorPage,
+  ModalConfirm,
   PopUpWarning,
   // contexts
   useGlobalContext,
@@ -204,13 +205,13 @@ const SettingsViewWrapper = ({
               toggleWarningCancel();
             }}
           />
-          <PopUpWarning
+          <ModalConfirm
             isOpen={showWarningSubmit}
-            toggleModal={toggleWarningSubmit}
+            toggle={toggleWarningSubmit}
             content={{
-              message: `${pluginId}.popUpWarning.warning.updateAllSettings`,
+              id: `${pluginId}.popUpWarning.warning.updateAllSettings`,
             }}
-            popUpWarningType="danger"
+            type="success"
             onConfirm={async () => {
               await onConfirmSubmit();
               toggleWarningSubmit();
diff --git a/packages/strapi-plugin-i18n/admin/src/components/CMEditViewCopyLocale/index.js b/packages/strapi-plugin-i18n/admin/src/components/CMEditViewCopyLocale/index.js
index c15453342c..28737caeef 100644
--- a/packages/strapi-plugin-i18n/admin/src/components/CMEditViewCopyLocale/index.js
+++ b/packages/strapi-plugin-i18n/admin/src/components/CMEditViewCopyLocale/index.js
@@ -101,7 +101,8 @@ const CMEditViewCopyLocale = ({ appLocales, currentLocale, localizations, readPe
       <ModalConfirm
         showButtonLoader={isLoading}
         confirmButtonLabel={{
-          id: 'form.button.finish',
+          id: getTrad('CMEditViewCopyLocale.submit-text'),
+          defaultMessage: 'Yes, fill in',
         }}
         content={{
           id: 'CMEditViewCopyLocale.ModalConfirm.content',
diff --git a/packages/strapi-plugin-i18n/admin/src/translations/en.json b/packages/strapi-plugin-i18n/admin/src/translations/en.json
index 4cd10955e0..0eb76cd047 100644
--- a/packages/strapi-plugin-i18n/admin/src/translations/en.json
+++ b/packages/strapi-plugin-i18n/admin/src/translations/en.json
@@ -17,6 +17,7 @@
   "CMEditViewCopyLocale.copy-success": "Locale copied",
   "CMEditViewCopyLocale.copy-failure": "Failed to copy locale",
   "CMEditViewCopyLocale.copy-text": "Fill in from another locale",
+  "CMEditViewCopyLocale.submit-text": "Yes, fill in",
   "Field.localized": "This value is unique for the selected locale",
   "Field.not-localized": "This value is common to all locales",
   "Settings.list.description": "Configure the settings for the internationalization plugin",