summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-10-11 11:52:49 +0200
committerMorris Jobke <hey@morrisjobke.de>2017-04-29 00:59:09 -0300
commit2507e7459d42e47f0581aeb69b738fec6497c6b5 (patch)
tree2af7cf283c5d974965617330b665896d4231ab17
parent74802ca72f27f41beb577f0ba9c085a50ed224e2 (diff)
downloadnextcloud-server-2507e7459d42e47f0581aeb69b738fec6497c6b5.tar.gz
nextcloud-server-2507e7459d42e47f0581aeb69b738fec6497c6b5.zip
Improve wording of error messages
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rw-r--r--settings/Controller/UsersController.php8
-rw-r--r--settings/js/users/users.js2
-rw-r--r--tests/Settings/Controller/UsersControllerTest.php12
3 files changed, 11 insertions, 11 deletions
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 7ce4355aa0b..411269a4351 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 117c61b7dcb..2a0b0c09a92 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 5cae52ece70..b6eba294d36 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.',
],
]
);