From d7c9e2b8415794d2bfeabfb4a463b5d238435b27 Mon Sep 17 00:00:00 2001
From: Matthew Setter <matthew@matthewsetter.com>
Date: Mon, 27 Feb 2017 10:16:57 +0100
Subject: [PATCH] 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>
---
 apps/encryption/lib/Controller/StatusController.php | 2 +-
 apps/encryption/templates/settings-personal.php     | 2 +-
 settings/Controller/ChangePasswordController.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index 6882475e97..0776a84ceb 100644
--- 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 2ea55e15c8..6ab4bf6f5f 100644
--- 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 832cdbefdb..b82751bcac 100644
--- 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) {