sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3999 from nextcloud/backport-27262 

Updated UI messages relating to the encryption functionality
pull/3438/head
Morris Jobke 2017-03-23 00:25:59 +07:00 committed by GitHub
parent 39ac804899 d7c9e2b841
commit 9e2588f2cb
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/encryption/lib/Controller/StatusController.php
Unescape Escape View File

@ -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:

2
apps/encryption/templates/settings-personal.php
Unescape Escape View File

@ -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>

2
settings/Controller/ChangePasswordController.php
Unescape Escape View File

@ -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) {