diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php index bef915cd0b..16bcb0f0bb 100644 --- a/src/applications/herald/storage/HeraldRule.php +++ b/src/applications/herald/storage/HeraldRule.php @@ -408,7 +408,7 @@ final class HeraldRule extends HeraldDAO } else if ($this->isObjectRule()) { return pht('Object rules inherit the edit policies of their objects.'); } else { - return pht('A personal rule can only be edited by its owner.'); + return pht('A personal rule can only be edited by its author.'); } } diff --git a/src/applications/herald/storage/transcript/HeraldRuleResult.php b/src/applications/herald/storage/transcript/HeraldRuleResult.php index e7fc39bfd0..13555a2b96 100644 --- a/src/applications/herald/storage/transcript/HeraldRuleResult.php +++ b/src/applications/herald/storage/transcript/HeraldRuleResult.php @@ -149,10 +149,10 @@ final class HeraldRuleResult self::RESULT_OWNER => array( 'match' => null, 'apply' => false, - 'name' => pht('Rule Owner'), + 'name' => pht('Rule Author'), 'description' => pht( 'Rule failed automatically because it is a personal rule and '. - 'its owner is invalid or disabled.'), + 'its author is invalid or disabled.'), 'icon' => 'fa-times-circle', 'color.icon' => 'red', ), @@ -162,7 +162,7 @@ final class HeraldRuleResult 'name' => pht('View Policy'), 'description' => pht( 'Rule failed automatically because it is a personal rule and '. - 'its owner does not have permission to view the object.'), + 'its author does not have permission to view the object.'), 'icon' => 'fa-times-circle', 'color.icon' => 'red', ), diff --git a/src/applications/maniphest/editor/ManiphestEditEngine.php b/src/applications/maniphest/editor/ManiphestEditEngine.php index e11c977436..3b728ccf0c 100644 --- a/src/applications/maniphest/editor/ManiphestEditEngine.php +++ b/src/applications/maniphest/editor/ManiphestEditEngine.php @@ -202,7 +202,7 @@ EODOCS ->setDescription(pht('User who is responsible for the task.')) ->setConduitDescription(pht('Reassign the task.')) ->setConduitTypeDescription( - pht('New task owner, or `null` to unassign.')) + pht('New task assignee, or `null` to unassign.')) ->setTransactionType(ManiphestTaskOwnerTransaction::TRANSACTIONTYPE) ->setIsCopyable(true) ->setIsNullable(true) diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php index 08fb7883da..af6bbce390 100644 --- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php +++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php @@ -177,7 +177,7 @@ final class ManiphestTransactionEditor ManiphestTransaction::MAILTAG_STATUS => pht("A task's status changes."), ManiphestTransaction::MAILTAG_OWNER => - pht("A task's owner changes."), + pht("A task's assignee changes."), ManiphestTransaction::MAILTAG_PRIORITY => pht("A task's priority changes."), ManiphestTransaction::MAILTAG_CC => @@ -829,19 +829,19 @@ final class ManiphestTransactionEditor $message = pht( 'You can not lock this task and unassign it at the same time '. 'because no one will be able to edit it anymore. Lock the task '. - 'or remove the owner, but not both.'); + 'or remove the assignee, but not both.'); $problem_xaction = $status_xaction; } else if ($status_changed) { $message = pht( - 'You can not lock this task because it does not have an owner. '. + 'You can not lock this task because it does not have an assignee. '. 'No one would be able to edit the task. Assign the task to an '. - 'owner before locking it.'); + 'assignee before locking it.'); $problem_xaction = $status_xaction; } else if ($owner_changed) { $message = pht( - 'You can not remove the owner of this task because it is locked '. + 'You can not remove the assignee of this task because it is locked '. 'and no one would be able to edit the task. Reassign the task or '. - 'unlock it before removing the owner.'); + 'unlock it before removing the assignee.'); $problem_xaction = $owner_xaction; } else { // If the task was already broken, we don't have a transaction to diff --git a/src/applications/maniphest/policy/ManiphestTaskPolicyCodex.php b/src/applications/maniphest/policy/ManiphestTaskPolicyCodex.php index 4394331541..d8203e8d5a 100644 --- a/src/applications/maniphest/policy/ManiphestTaskPolicyCodex.php +++ b/src/applications/maniphest/policy/ManiphestTaskPolicyCodex.php @@ -46,7 +46,7 @@ final class ManiphestTaskPolicyCodex PhabricatorPolicyCapability::CAN_EDIT, )) ->setDescription( - pht('The owner of a task can always view and edit it.')); + pht('The assignee of a task can always view and edit it.')); $rules[] = $this->newRule() ->setCapabilities( @@ -56,7 +56,7 @@ final class ManiphestTaskPolicyCodex ->setIsActive($object->areEditsLocked()) ->setDescription( pht( - 'Tasks with edits locked may only be edited by their owner.')); + 'Tasks with edits locked may only be edited by their assignee.')); return $rules; } @@ -64,8 +64,8 @@ final class ManiphestTaskPolicyCodex public function getPolicyForEdit($capability) { // When a task has its edits locked, the effective edit policy is locked - // to "No One". However, the task owner may still bypass the lock and edit - // the task. When they do, we want the control in the UI to have the + // to "No One". However, the task assignee may still bypass the lock and + // edit the task. When they do, we want the control in the UI to have the // correct value. Return the real value stored on the object. switch ($capability) { diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php index 96a260dbd4..1636032335 100644 --- a/src/applications/maniphest/storage/ManiphestTask.php +++ b/src/applications/maniphest/storage/ManiphestTask.php @@ -345,7 +345,7 @@ final class ManiphestTask extends ManiphestDAO } public function hasAutomaticCapability($capability, PhabricatorUser $user) { - // The owner of a task can always view and edit it. + // The owner (assignee) of a task can always view and edit it. $owner_phid = $this->getOwnerPHID(); if ($owner_phid) { $user_phid = $user->getPHID(); @@ -445,7 +445,7 @@ final class ManiphestTask extends ManiphestDAO id(new PhabricatorConduitSearchFieldSpecification()) ->setKey('ownerPHID') ->setType('phid?') - ->setDescription(pht('Current task owner, if task is assigned.')), + ->setDescription(pht('Current task assignee, if task is assigned.')), id(new PhabricatorConduitSearchFieldSpecification()) ->setKey('status') ->setType('map') diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php index efcf2d77a6..0884e780a7 100644 --- a/src/applications/maniphest/storage/ManiphestTransaction.php +++ b/src/applications/maniphest/storage/ManiphestTransaction.php @@ -202,7 +202,7 @@ final class ManiphestTransaction case ManiphestTaskStatusTransaction::TRANSACTIONTYPE: return pht('The task already has the selected status.'); case ManiphestTaskOwnerTransaction::TRANSACTIONTYPE: - return pht('The task already has the selected owner.'); + return pht('The task already has the selected assignee.'); case ManiphestTaskPriorityTransaction::TRANSACTIONTYPE: return pht('The task already has the selected priority.'); } diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php index aa0ccc881d..c469f38f6e 100644 --- a/src/applications/pholio/storage/PholioMock.php +++ b/src/applications/pholio/storage/PholioMock.php @@ -193,7 +193,7 @@ final class PholioMock extends PholioDAO } public function describeAutomaticCapability($capability) { - return pht("A mock's owner can always view and edit it."); + return pht('The author of a mock can always view and edit it.'); } diff --git a/src/applications/phurl/storage/PhabricatorPhurlURL.php b/src/applications/phurl/storage/PhabricatorPhurlURL.php index feeadcbcba..51ea1cd635 100644 --- a/src/applications/phurl/storage/PhabricatorPhurlURL.php +++ b/src/applications/phurl/storage/PhabricatorPhurlURL.php @@ -152,7 +152,7 @@ final class PhabricatorPhurlURL extends PhabricatorPhurlDAO } public function describeAutomaticCapability($capability) { - return pht('The owner of a URL can always view and edit it.'); + return pht('The author of a URL can always view and edit it.'); } /* -( PhabricatorApplicationTransactionInterface )------------------------- */ diff --git a/src/applications/slowvote/constants/SlowvotePollResponseVisibility.php b/src/applications/slowvote/constants/SlowvotePollResponseVisibility.php index 1daf237e72..106ec141bc 100644 --- a/src/applications/slowvote/constants/SlowvotePollResponseVisibility.php +++ b/src/applications/slowvote/constants/SlowvotePollResponseVisibility.php @@ -66,8 +66,8 @@ final class SlowvotePollResponseVisibility 'name.edit' => pht('Require a vote to see the responses'), ), self::RESPONSES_OWNER => array( - 'name' => pht('Owner'), - 'name.edit' => pht('Only the poll owner can see the responses'), + 'name' => pht('Author'), + 'name.edit' => pht('Only the poll author can see the responses'), ), ); } diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php index 68263fccb7..d754b743c2 100644 --- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php +++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerBulkJob.php @@ -211,7 +211,7 @@ final class PhabricatorWorkerBulkJob public function describeAutomaticCapability($capability) { switch ($capability) { case PhabricatorPolicyCapability::CAN_EDIT: - return pht('Only the owner of a bulk job can edit it.'); + return pht('Only the author of a bulk job can edit it.'); default: return null; }