From 04a35a1e36e512b52b45beaab5ce1271c9c8f607 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Mon, 7 Jun 2021 11:41:28 +0300
Subject: [PATCH] Improved wording in configuration export related logs and UI

---
 monkey/monkey_island/cc/resources/configuration_import.py       | 2 +-
 monkey/monkey_island/cc/services/utils/config_encryption.py     | 2 +-
 .../components/configuration-components/ExportConfigModal.tsx   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/monkey/monkey_island/cc/resources/configuration_import.py b/monkey/monkey_island/cc/resources/configuration_import.py
index 40413c3f5..d9d39a3f8 100644
--- a/monkey/monkey_island/cc/resources/configuration_import.py
+++ b/monkey/monkey_island/cc/resources/configuration_import.py
@@ -63,7 +63,7 @@ class ConfigurationImport(flask_restful.Resource):
             return ResponseContents(
                 import_status=ImportStatuses.INVALID_CONFIGURATION,
                 message="Invalid configuration supplied. "
-                "Maybe the format is outdated or the file is corrupted.",
+                "Maybe the format is outdated or the file has been corrupted.",
             ).form_response()
         except NoCredentialsError:
             return ResponseContents(
diff --git a/monkey/monkey_island/cc/services/utils/config_encryption.py b/monkey/monkey_island/cc/services/utils/config_encryption.py
index 45a31c5b1..49f5cc187 100644
--- a/monkey/monkey_island/cc/services/utils/config_encryption.py
+++ b/monkey/monkey_island/cc/services/utils/config_encryption.py
@@ -50,7 +50,7 @@ def decrypt_config(cyphertext: str, password: str) -> Dict:
             logger.info("Wrong password for configuration provided.")
             raise InvalidCredentialsError
         else:
-            logger.info("Configuration is corrupted.")
+            logger.info("The provided configuration file is corrupt.")
             raise ex
     plaintext_config = json.loads(dec_plaintext_config_stream.getvalue().decode("utf-8"))
     return plaintext_config
diff --git a/monkey/monkey_island/cc/ui/src/components/configuration-components/ExportConfigModal.tsx b/monkey/monkey_island/cc/ui/src/components/configuration-components/ExportConfigModal.tsx
index 3457555c4..d30438cbd 100644
--- a/monkey/monkey_island/cc/ui/src/components/configuration-components/ExportConfigModal.tsx
+++ b/monkey/monkey_island/cc/ui/src/components/configuration-components/ExportConfigModal.tsx
@@ -119,7 +119,7 @@ const ExportPlaintextChoiceField = (props: {
       />
       <p className={`export-warning text-secondary`}>
         Configuration may contain stolen credentials or sensitive data.<br/>
-        It is advised to use the <b>Encrypt with a password</b> option.
+        It is recommended that you use the <b>Encrypt with a password</b> option.
       </p>
     </div>
   )