summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-23 00:25:59 -0600
committerGitHub <noreply@github.com>2017-03-23 00:25:59 -0600
commit9e2588f2cba241c15acb1fd628356ca6024caa29 (patch)
tree0fe04f0ed48074687b590d518be5952e4290da60 /apps
parent39ac804899197069b40384afdc40966e22658eca (diff)
parentd7c9e2b8415794d2bfeabfb4a463b5d238435b27 (diff)
downloadnextcloud-server-9e2588f2cba241c15acb1fd628356ca6024caa29.tar.gz
nextcloud-server-9e2588f2cba241c15acb1fd628356ca6024caa29.zip
Merge pull request #3999 from nextcloud/backport-27262
Updated UI messages relating to the encryption functionality
Diffstat (limited to 'apps')
-rw-r--r--apps/encryption/lib/Controller/StatusController.php2
-rw-r--r--apps/encryption/templates/settings-personal.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index 6882475e972..0776a84ceb4 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 2ea55e15c80..6ab4bf6f5f4 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>