Updated UI messages relating to the encryption functionality

The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:

- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones

They were also missing full-stops to end the them.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index 6882475e972c6cb6999c88e26042ca436ee13776..0776a84ceb4a8564a9b78b690092a2f086639187 100644 (file)
--- a/apps/encryption/lib/Controller/StatusController.php
+++ b/apps/encryption/lib/Controller/StatusController.php
@@ -79,7 +79,7 @@ class StatusController extends Controller {
                        case Session::NOT_INITIALIZED:
                                $status = 'interactionNeeded';
                                $message = (string)$this->l->t(
-                                       'Encryption app is enabled but your keys are not initialized, please log-out and log-in again'
+                                       'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
                                );
                                break;
                        case Session::INIT_SUCCESSFUL:

diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index 2ea55e15c8094f807edee2731a4ecc2c488c956f..6ab4bf6f5f4bdde334b73798a239714c4a082c01 100644 (file)
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -9,7 +9,7 @@ script('core', 'multiselect');
 
        <?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
 
-       <?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
+       <?php p($l->t("Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.")); ?>
 
        <?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
                <p>

diff --git a/settings/Controller/ChangePasswordController.php b/settings/Controller/ChangePasswordController.php
index 832cdbefdbe9335e6ccaf7478a64448e0d51048e..b82751bcac2a5a2341b5f04e5531b018df7a3f26 100644 (file)
--- a/settings/Controller/ChangePasswordController.php
+++ b/settings/Controller/ChangePasswordController.php
@@ -217,7 +217,7 @@ class ChangePasswordController extends Controller {
                                return new JSONResponse([
                                        'status' => 'error',
                                        'data' => [
-                                               'message' => $this->l->t('Please provide an admin recovery password, otherwise all user data will be lost'),
+                                               'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'),
                                        ]
                                ]);
                        } elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {