@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Replace "User Disabled" with "User Account Disabled"
Summary:
These message refer to user accounts, not users. Thus avoid any ambiguity.
(`PhabricatorDisabledUserController` already does it right by setting `Account Disabled`.)
Refs T16252
Test Plan: Look at strings.
Reviewers: O1 Blessed Committers, valerio.bozzolan, haylin
Reviewed By: O1 Blessed Committers, valerio.bozzolan, haylin
Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno
Maniphest Tasks: T16252
Differential Revision: https://we.phorge.it/D26417
+19
-19
+6
-6
src/applications/people/controller/PhabricatorPeopleDisableController.php
+6
-6
src/applications/people/controller/PhabricatorPeopleDisableController.php
···
20
20
return new Aphront404Response();
21
21
}
22
22
23
-
// NOTE: We reach this controller via the administrative "Disable User"
23
+
// NOTE: We reach this controller via the administrative "Disable Account"
24
24
// on profiles and also via the "X" action on the approval queue. We do
25
25
// things slightly differently depending on the context the actor is in.
26
26
···
86
86
}
87
87
88
88
if ($should_disable) {
89
-
$title = pht('Disable User?');
90
-
$short_title = pht('Disable User');
89
+
$title = pht('Disable User Account?');
90
+
$short_title = pht('Disable Account');
91
91
92
92
$body = pht(
93
93
'Disable %s? They will no longer be able to access this server or '.
94
94
'receive email.',
95
95
phutil_tag('strong', array(), $user->getUsername()));
96
96
97
-
$submit = pht('Disable User');
97
+
$submit = pht('Disable Account');
98
98
} else {
99
-
$title = pht('Enable User?');
99
+
$title = pht('Enable User Account?');
100
100
$short_title = pht('Enable User');
101
101
102
102
$body = pht(
···
104
104
'email again.',
105
105
phutil_tag('strong', array(), $user->getUsername()));
106
106
107
-
$submit = pht('Enable User');
107
+
$submit = pht('Enable Account');
108
108
}
109
109
110
110
return $this->newDialog()
+2
-2
src/applications/people/controller/PhabricatorPeopleProfileManageController.php
+2
-2
src/applications/people/controller/PhabricatorPeopleProfileManageController.php
···
152
152
153
153
if ($user->getIsDisabled()) {
154
154
$disable_icon = 'fa-check-circle-o';
155
-
$disable_name = pht('Enable User');
155
+
$disable_name = pht('Enable Account');
156
156
} else {
157
157
$disable_icon = 'fa-ban';
158
-
$disable_name = pht('Disable User');
158
+
$disable_name = pht('Disable Account');
159
159
}
160
160
161
161
$curtain->addAction(
+1
-1
src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php
+1
-1
src/applications/people/mail/PhabricatorPeopleEmailLoginMailEngine.php
+1
-1
src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
+1
-1
src/applications/people/mail/PhabricatorPeopleWelcomeMailEngine.php
+4
-4
src/applications/people/query/PhabricatorPeopleSearchEngine.php
+4
-4
src/applications/people/query/PhabricatorPeopleSearchEngine.php
···
46
46
->setKey('isDisabled')
47
47
->setOptions(
48
48
pht('(Show All)'),
49
-
pht('Show Only Disabled Users'),
50
-
pht('Hide Disabled Users'))
49
+
pht('Show Only Disabled Accounts'),
50
+
pht('Hide Disabled Accounts'))
51
51
->setDescription(
52
52
pht(
53
-
'Pass true to find only disabled users, or false to omit '.
54
-
'disabled users.')),
53
+
'Pass true to find only disabled accounts, or false to omit '.
54
+
'disabled accounts.')),
55
55
id(new PhabricatorSearchThreeStateField())
56
56
->setLabel(pht('Bots'))
57
57
->setKey('isBot')
+5
-5
src/docs/user/userguide/users.diviner
+5
-5
src/docs/user/userguide/users.diviner
···
86
86
a "Mailing List" note.
87
87
88
88
89
-
Disabled Users
90
-
==============
89
+
Disabled User Accounts
90
+
======================
91
91
92
-
**Disabled Users** are accounts that are no longer active. Generally, when
92
+
**Disabled Accounts** are accounts that are no longer active. Generally, when
93
93
someone leaves a project (e.g., leaves your company, or their internship or
94
94
contract ends) you should disable their account to terminate their access to
95
-
the system. Disabled users:
95
+
the system. Disabled user accounts:
96
96
97
97
- can not login;
98
98
- can not access the Conduit API;
99
99
- do not receive email; and
100
100
- appear with lower precedence in the UI when selecting users, with a
101
101
"Disabled" note (because it usually does not make sense to, for example,
102
-
assign a task to a disabled user).
102
+
assign a task to a disabled user account).
103
103
104
104
While users can also be deleted, it is strongly recommended that you disable
105
105
them instead, particularly if they interacted with any objects in the system.