mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve wording of error messages 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2016-10-11 11:52:49 +02:00
parent 74802ca72f
commit 2507e7459d
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
settings/Controller/UsersController.php
View File

@ -530,7 +530,7 @@ class UsersController extends Controller {
array( array(
'status' => 'error', 'status' => 'error',
'data' => array( 'data' => array(
'message' => (string)$this->l10n->t('Unable to disable user.') 'message' => (string)$this->l10n->t('Error while disabling user.')
) )
), ),
Http::STATUS_FORBIDDEN Http::STATUS_FORBIDDEN
@ -565,7 +565,7 @@ class UsersController extends Controller {
array( array(
'status' => 'error', 'status' => 'error',
'data' => array( 'data' => array(
'message' => (string)$this->l10n->t('Unable to disable user.') 'message' => (string)$this->l10n->t('Error while disabling user.')
) )
) )
); );
@ -587,7 +587,7 @@ class UsersController extends Controller {
array( array(
'status' => 'error', 'status' => 'error',
'data' => array( 'data' => array(
'message' => (string)$this->l10n->t('Unable to enable user.') 'message' => (string)$this->l10n->t('Error while enabling user.')
) )
), ),
Http::STATUS_FORBIDDEN Http::STATUS_FORBIDDEN
@ -622,7 +622,7 @@ class UsersController extends Controller {
array( array(
'status' => 'error', 'status' => 'error',
'data' => array( 'data' => array(
'message' => (string)$this->l10n->t('Unable to enable user.') 'message' => (string)$this->l10n->t('Error while enabling user.')
) )
) )
); );

2
settings/js/users/users.js
View File

@ -946,7 +946,7 @@ $(document).ready(function () {
GroupList.setUserCount(GroupList.getGroupLI('_disabledUsers'), count+1); GroupList.setUserCount(GroupList.getGroupLI('_disabledUsers'), count+1);
} }
} else { } else {
OC.dialogs.alert(result.data.message, t('settings', 'Unable to change status of {user}', {user: uid})); OC.dialogs.alert(result.data.message, t('settings', 'Error while changing status of {user}', {user: uid}));
} }
} }
); );

12
tests/Settings/Controller/UsersControllerTest.php
View File

@ -2455,7 +2455,7 @@ class UsersControllerTest extends \Test\TestCase {
[ [
'status' => 'error', 'status' => 'error',
'data' => [ 'data' => [
'message' => 'Unable to disable user.', 'message' => 'Error while disabling user.',
], ],
], ],
Http::STATUS_FORBIDDEN Http::STATUS_FORBIDDEN
@ -2530,7 +2530,7 @@ class UsersControllerTest extends \Test\TestCase {
[ [
'status' => 'error', 'status' => 'error',
'data' => [ 'data' => [
'message' => 'Unable to disable user.', 'message' => 'Error while disabling user.',
], ],
] ]
); );
@ -2567,7 +2567,7 @@ class UsersControllerTest extends \Test\TestCase {
[ [
'status' => 'error', 'status' => 'error',
'data' => [ 'data' => [
'message' => 'Unable to disable user.', 'message' => 'Error while disabling user.',
], ],
] ]
); );
@ -2669,7 +2669,7 @@ class UsersControllerTest extends \Test\TestCase {
[ [
'status' => 'error', 'status' => 'error',
'data' => [ 'data' => [
'message' => 'Unable to enable user.', 'message' => 'Error while enabling user.',
], ],
], ],
Http::STATUS_FORBIDDEN Http::STATUS_FORBIDDEN
@ -2744,7 +2744,7 @@ class UsersControllerTest extends \Test\TestCase {
[ [
'status' => 'error', 'status' => 'error',
'data' => [ 'data' => [
'message' => 'Unable to enable user.', 'message' => 'Error while enabling user.',
], ],
] ]
); );
@ -2781,7 +2781,7 @@ class UsersControllerTest extends \Test\TestCase {
[ [
'status' => 'error', 'status' => 'error',
'data' => [ 'data' => [
'message' => 'Unable to enable user.', 'message' => 'Error while enabling user.',
], ],
] ]
); );