diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index 7ce4355aa0..411269a435 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -530,7 +530,7 @@ class UsersController extends Controller { array( 'status' => 'error', 'data' => array( - 'message' => (string)$this->l10n->t('Unable to disable user.') + 'message' => (string)$this->l10n->t('Error while disabling user.') ) ), Http::STATUS_FORBIDDEN @@ -565,7 +565,7 @@ class UsersController extends Controller { array( 'status' => 'error', '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( 'status' => 'error', 'data' => array( - 'message' => (string)$this->l10n->t('Unable to enable user.') + 'message' => (string)$this->l10n->t('Error while enabling user.') ) ), Http::STATUS_FORBIDDEN @@ -622,7 +622,7 @@ class UsersController extends Controller { array( 'status' => 'error', 'data' => array( - 'message' => (string)$this->l10n->t('Unable to enable user.') + 'message' => (string)$this->l10n->t('Error while enabling user.') ) ) ); diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 117c61b7dc..2a0b0c09a9 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -946,7 +946,7 @@ $(document).ready(function () { GroupList.setUserCount(GroupList.getGroupLI('_disabledUsers'), count+1); } } 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})); } } ); diff --git a/tests/Settings/Controller/UsersControllerTest.php b/tests/Settings/Controller/UsersControllerTest.php index 5cae52ece7..b6eba294d3 100644 --- a/tests/Settings/Controller/UsersControllerTest.php +++ b/tests/Settings/Controller/UsersControllerTest.php @@ -2455,7 +2455,7 @@ class UsersControllerTest extends \Test\TestCase { [ 'status' => 'error', 'data' => [ - 'message' => 'Unable to disable user.', + 'message' => 'Error while disabling user.', ], ], Http::STATUS_FORBIDDEN @@ -2530,7 +2530,7 @@ class UsersControllerTest extends \Test\TestCase { [ 'status' => 'error', 'data' => [ - 'message' => 'Unable to disable user.', + 'message' => 'Error while disabling user.', ], ] ); @@ -2567,7 +2567,7 @@ class UsersControllerTest extends \Test\TestCase { [ 'status' => 'error', 'data' => [ - 'message' => 'Unable to disable user.', + 'message' => 'Error while disabling user.', ], ] ); @@ -2669,7 +2669,7 @@ class UsersControllerTest extends \Test\TestCase { [ 'status' => 'error', 'data' => [ - 'message' => 'Unable to enable user.', + 'message' => 'Error while enabling user.', ], ], Http::STATUS_FORBIDDEN @@ -2744,7 +2744,7 @@ class UsersControllerTest extends \Test\TestCase { [ 'status' => 'error', 'data' => [ - 'message' => 'Unable to enable user.', + 'message' => 'Error while enabling user.', ], ] ); @@ -2781,7 +2781,7 @@ class UsersControllerTest extends \Test\TestCase { [ 'status' => 'error', 'data' => [ - 'message' => 'Unable to enable user.', + 'message' => 'Error while enabling user.', ], ] );