diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php --- a/src/applications/base/PhabricatorApplication.php +++ b/src/applications/base/PhabricatorApplication.php @@ -406,13 +406,13 @@ /** - * Determine if an application is installed, by application class name. + * Determine if an application is enabled, by application class name. * - * To check if an application is installed //and// available to a particular + * To check if an application is enabled //and// available to a particular * viewer, user @{method:isClassInstalledForViewer}. * * @param class-string $class Application class name. - * @return bool True if the class is installed. + * @return bool True if the application is enabled. * @task meta */ final public static function isClassInstalled($class) { @@ -421,15 +421,15 @@ /** - * Determine if an application is installed and available to a viewer, by + * Determine if an application is enabled and available to a viewer, by * application class name. * - * To check if an application is installed at all, use + * To check if an application is enabled at all, use * @{method:isClassInstalled}. * * @param class-string $class Application class name. * @param PhabricatorUser $viewer Viewing user. - * @return bool True if the class is installed for the viewer. + * @return bool True if the application is enabled for the viewer. * @task meta */ final public static function isClassInstalledForViewer( @@ -451,7 +451,7 @@ } else { $application = self::getByClass($class); if (!$application->canUninstall()) { - // If the application can not be uninstalled, always allow viewers + // If the application can not be disabled, always allow viewers // to see it. In particular, this allows logged-out viewers to see // Settings and load global default settings even if the install // does not allow public viewers. @@ -471,15 +471,15 @@ } /** - * Determine if an application is installed at all, and if a viewer is given + * Determine if an application is enabled at all, and if a viewer is given * if the application is available to a viewer, by application class name. * - * To check if an application is installed at all, use + * To check if an application is enabled at all, use * @{method:isClassInstalled}. * * @param class-string $class Application class name. * @param PhabricatorUser|null $viewer Viewing user. - * @return bool True if the class is installed or if the installed class is + * @return bool True if the class is enabled or if the enabled application is * available to the viewer when a viewer is given. * @task meta */ diff --git a/src/infrastructure/testing/PhabricatorTestCase.php b/src/infrastructure/testing/PhabricatorTestCase.php --- a/src/infrastructure/testing/PhabricatorTestCase.php +++ b/src/infrastructure/testing/PhabricatorTestCase.php @@ -94,8 +94,8 @@ $this->env = PhabricatorEnv::beginScopedEnv(); // NOTE: While running unit tests, we act as though all applications are - // installed, regardless of the install's configuration. Tests which need - // to uninstall applications are responsible for adjusting state themselves + // enabled, regardless of the install's configuration. Tests which need + // to disable applications are responsible for adjusting state themselves // (such tests are exceedingly rare). $this->env->overrideEnvConfig( diff --git a/src/applications/audit/query/PhabricatorCommitSearchEngine.php b/src/applications/audit/query/PhabricatorCommitSearchEngine.php --- a/src/applications/audit/query/PhabricatorCommitSearchEngine.php +++ b/src/applications/audit/query/PhabricatorCommitSearchEngine.php @@ -236,7 +236,7 @@ $bucket = $this->getResultBucket($query); - // hide "Auditors" on /diffusion/commit/query/all/ if Audit not installed + // hide "Auditors" on /diffusion/commit/query/all/ if Audit not enabled $show_auditors = id(new PhabricatorAuditApplication())->isInstalled(); $template = id(new DiffusionCommitGraphView()) ->setViewer($viewer) diff --git a/src/applications/conduit/method/ConduitAPIMethod.php b/src/applications/conduit/method/ConduitAPIMethod.php --- a/src/applications/conduit/method/ConduitAPIMethod.php +++ b/src/applications/conduit/method/ConduitAPIMethod.php @@ -269,7 +269,7 @@ /** * Optionally, return a @{class:PhabricatorApplication} which this call is - * part of. The call will be disabled when the application is uninstalled. + * part of. The call will be disabled when the application is disabled. * * @return PhabricatorApplication|null Related application. */ diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php --- a/src/applications/config/option/PhabricatorCoreConfigOptions.php +++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php @@ -135,7 +135,7 @@ )) ->setSummary( pht( - 'Install applications which are still under development.')) + 'Enable applications which are still under development.')) ->setDescription( pht( "IMPORTANT: The upstream does not provide support for prototype ". @@ -143,14 +143,14 @@ "\n\n". "This platform includes prototype applications which are in an ". "**early stage of development**. By default, prototype ". - "applications are not installed, because they are often not yet ". + "applications are disabled, because they are often not yet ". "developed enough to be generally usable. You can enable ". - "this option to install them if you're developing applications ". + "this option to enable them if you're developing applications ". "or are interested in previewing upcoming features.". "\n\n". "To learn more about prototypes, see [[ %s | %s ]].". "\n\n". - "After enabling prototypes, you can selectively uninstall them ". + "After enabling prototypes, you can selectively disable them ". "(like normal applications).", $proto_doc_href, $proto_doc_name)), @@ -239,7 +239,7 @@ $this->newOption('phabricator.uninstalled-applications', 'set', array()) ->setLocked(true) ->setLockedMessage(pht( - 'Use the %s to manage installed applications.', + 'Use the %s to manage enabled applications.', phutil_tag( 'a', array( @@ -247,7 +247,7 @@ ), pht('Applications application')))) ->setDescription( - pht('Array containing list of uninstalled applications.')), + pht('Array containing list of disabled applications.')), $this->newOption('phabricator.application-settings', 'wild', array()) ->setLocked(true) ->setDescription( diff --git a/src/applications/diffusion/editor/DiffusionCommitEditEngine.php b/src/applications/diffusion/editor/DiffusionCommitEditEngine.php --- a/src/applications/diffusion/editor/DiffusionCommitEditEngine.php +++ b/src/applications/diffusion/editor/DiffusionCommitEditEngine.php @@ -101,7 +101,7 @@ $fields = array(); // remove "Change Auditors" from "Add Action" dropdown etc - // if Audit is not installed + // if Audit is disabled if (id(new PhabricatorAuditApplication())->isInstalled()) { $fields[] = id(new PhabricatorDatasourceEditField()) ->setKey('auditors') diff --git a/src/applications/diffusion/herald/DiffusionAuditorsAddAuditorsHeraldAction.php b/src/applications/diffusion/herald/DiffusionAuditorsAddAuditorsHeraldAction.php --- a/src/applications/diffusion/herald/DiffusionAuditorsAddAuditorsHeraldAction.php +++ b/src/applications/diffusion/herald/DiffusionAuditorsAddAuditorsHeraldAction.php @@ -9,7 +9,7 @@ return pht('Add auditors'); } - // hide "Add auditors" Herald action if Audit not installed + // hide "Add auditors" Herald action if Audit is disabled public function supportsRuleType($rule_type) { if (id(new PhabricatorAuditApplication())->isInstalled()) { return ($rule_type != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL); diff --git a/src/applications/diffusion/herald/DiffusionAuditorsAddSelfHeraldAction.php b/src/applications/diffusion/herald/DiffusionAuditorsAddSelfHeraldAction.php --- a/src/applications/diffusion/herald/DiffusionAuditorsAddSelfHeraldAction.php +++ b/src/applications/diffusion/herald/DiffusionAuditorsAddSelfHeraldAction.php @@ -9,7 +9,7 @@ return pht('Add me as an auditor'); } - // hide "Add me as an auditor" Herald action if Audit not installed + // hide "Add me as an auditor" Herald action if Audit is disabled public function supportsRuleType($rule_type) { if (id(new PhabricatorAuditApplication())->isInstalled()) { return ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL); diff --git a/src/applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php @@ -5,7 +5,7 @@ const FIELDCONST = 'diffusion.commit.auditors'; - // hide "Auditors" Herald condition if Audit not installed + // hide "Auditors" Herald condition if Audit is disabled public function supportsObject($object) { if (id(new PhabricatorAuditApplication())->isInstalled()) { return ($object instanceof PhabricatorRepositoryCommit); diff --git a/src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php --- a/src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php +++ b/src/applications/diffusion/herald/DiffusionCommitPackageAuditHeraldField.php @@ -6,7 +6,7 @@ const FIELDCONST = 'diffusion.commit.package.audit'; // hide "Affected packages that need audit" Herald condition - // if Audit not installed + // if Audit is disabled public function supportsObject($object) { if (id(new PhabricatorAuditApplication())->isInstalled()) { return ($object instanceof PhabricatorRepositoryCommit); diff --git a/src/applications/diffusion/view/DiffusionCommitGraphView.php b/src/applications/diffusion/view/DiffusionCommitGraphView.php --- a/src/applications/diffusion/view/DiffusionCommitGraphView.php +++ b/src/applications/diffusion/view/DiffusionCommitGraphView.php @@ -181,7 +181,7 @@ $this->addBuildAction($item_view, $hash); } - // hide Audit entry on /diffusion/commit/query/all if Audit not installed + // hide Audit entry on /diffusion/commit/query/all if Audit is disabled if (id(new PhabricatorAuditApplication())->isInstalled()) { $this->addAuditAction($item_view, $hash); } diff --git a/src/applications/feed/query/PhabricatorFeedTransactionQuery.php b/src/applications/feed/query/PhabricatorFeedTransactionQuery.php --- a/src/applications/feed/query/PhabricatorFeedTransactionQuery.php +++ b/src/applications/feed/query/PhabricatorFeedTransactionQuery.php @@ -155,9 +155,9 @@ ->setAncestorClass(PhabricatorApplicationTransactionQuery::class) ->execute(); - // Remove TransactionQuery classes of uninstalled apps. Increases query + // Remove TransactionQuery classes of disabled apps. Increases query // performance and decreases likeliness of a "Query Overheated" error if - // an app got uninstalled so data in it cannot be accessed anymore anyway. + // an app got disabled so data in it cannot be accessed anymore anyway. // See https://secure.phabricator.com/T13133, https://we.phorge.it/T15642 foreach ($queries as $key => $query) { $app = $query->getQueryApplicationClass(); diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php --- a/src/applications/harbormaster/storage/HarbormasterBuildable.php +++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php @@ -78,7 +78,7 @@ } // Skip all of this logic if the Harbormaster application - // isn't currently installed. + // isn't currently enabled. $harbormaster_app = PhabricatorHarbormasterApplication::class; if (!PhabricatorApplication::isClassInstalled($harbormaster_app)) { diff --git a/src/applications/herald/engine/HeraldEngine.php b/src/applications/herald/engine/HeraldEngine.php --- a/src/applications/herald/engine/HeraldEngine.php +++ b/src/applications/herald/engine/HeraldEngine.php @@ -729,7 +729,7 @@ } // The author must be able to create rules for the adapter's content type. - // In particular, this means that the application must be installed and + // In particular, this means that the application must be enabled and // accessible to the user. For example, if a user writes a Differential // rule and then loses access to Differential, this disables the rule. $enabled = HeraldAdapter::getEnabledAdapterMap($rule->getAuthor()); diff --git a/src/applications/herald/query/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php --- a/src/applications/herald/query/HeraldRuleQuery.php +++ b/src/applications/herald/query/HeraldRuleQuery.php @@ -94,7 +94,7 @@ // Filter out any rules that have invalid adapters, or have adapters the // viewer isn't permitted to see or use (for example, Differential rules - // if the user can't use Differential or Differential is not installed). + // if the user can't use Differential or Differential is disabled). $types = HeraldAdapter::getEnabledAdapterMap($this->getViewer()); foreach ($rules as $key => $rule) { if (empty($types[$rule->getContentType()])) { diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php --- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php +++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php @@ -33,9 +33,9 @@ ->setHeaderIcon($selected->getIcon()); if ($selected->isInstalled()) { - $header->setStatus('fa-check', 'bluegrey', pht('Installed')); + $header->setStatus('fa-check', 'bluegrey', pht('Enabled')); } else { - $header->setStatus('fa-ban', 'dark', pht('Uninstalled')); + $header->setStatus('fa-ban', 'dark', pht('Disabled')); } if (!$selected->isFirstParty()) { @@ -222,14 +222,14 @@ if ($application->isInstalled()) { $curtain->addAction( id(new PhabricatorActionView()) - ->setName(pht('Uninstall')) + ->setName(pht('Disable')) ->setIcon('fa-times') ->setDisabled(!$can_edit) ->setWorkflow(true) ->setHref($uninstall_uri)); } else { $action = id(new PhabricatorActionView()) - ->setName(pht('Install')) + ->setName(pht('Enable')) ->setIcon('fa-plus') ->setDisabled(!$can_edit) ->setWorkflow(true) @@ -246,7 +246,7 @@ } else { $curtain->addAction( id(new PhabricatorActionView()) - ->setName(pht('Uninstall')) + ->setName(pht('Disable')) ->setIcon('fa-times') ->setWorkflow(true) ->setDisabled(true) diff --git a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php --- a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php +++ b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php @@ -76,24 +76,24 @@ ->setTitle(pht('Confirmation')) ->appendChild( pht( - 'Install %s application?', + 'Enable %s application?', $application->getName())) - ->addSubmitButton(pht('Install')); + ->addSubmitButton(pht('Enable')); } else { $dialog ->setTitle(pht('Information')) - ->appendChild(pht('You cannot install an installed application.')); + ->appendChild(pht('You cannot enable an enabled application.')); } } else { if ($application->canUninstall()) { - $dialog->setTitle(pht('Really Uninstall Application?')); + $dialog->setTitle(pht('Really Disable Application?')); if ($application instanceof PhabricatorHomeApplication) { $dialog ->appendParagraph( pht( - 'Are you absolutely certain you want to uninstall the Home '. + 'Are you absolutely certain you want to disable the Home '. 'application?')) ->appendParagraph( pht( @@ -105,16 +105,16 @@ $dialog ->appendParagraph( pht( - 'Really uninstall the %s application?', + 'Really disable the %s application?', $application->getName())) - ->addSubmitButton(pht('Uninstall')); + ->addSubmitButton(pht('Disable')); } } else { $dialog ->setTitle(pht('Information')) ->appendChild( pht( - 'This application is required and cannot be uninstalled.')); + 'This application is required and cannot be disabled.')); } } return id(new AphrontDialogResponse())->setDialog($dialog); diff --git a/src/applications/meta/query/PhabricatorAppSearchEngine.php b/src/applications/meta/query/PhabricatorAppSearchEngine.php --- a/src/applications/meta/query/PhabricatorAppSearchEngine.php +++ b/src/applications/meta/query/PhabricatorAppSearchEngine.php @@ -96,14 +96,14 @@ ->setValue($saved->getParameter('name'))) ->appendChild( id(new AphrontFormSelectControl()) - ->setLabel(pht('Installed')) + ->setLabel(pht('Enabled')) ->setName('installed') ->setValue($this->getBoolFromQuery($saved, 'installed')) ->setOptions( array( '' => pht('Show All Applications'), - 'true' => pht('Show Installed Applications'), - 'false' => pht('Show Uninstalled Applications'), + 'true' => pht('Show Enabled Applications'), + 'false' => pht('Show Disabled Applications'), ))) ->appendChild( id(new AphrontFormSelectControl()) @@ -272,7 +272,7 @@ } if (!$application->isInstalled()) { - $item->addAttribute(pht('Uninstalled')); + $item->addAttribute(pht('Disabled')); $item->setDisabled(true); } diff --git a/src/applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php b/src/applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php --- a/src/applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php +++ b/src/applications/meta/xactions/PhabricatorApplicationUninstallTransaction.php @@ -45,7 +45,8 @@ $content_source = $editor->getContentSource(); // Today, changing config requires "Administrator", but "Can Edit" on - // applications to let you uninstall them may be granted to any user. + // applications to let you disable an application may be granted to any + // user. PhabricatorConfigEditor::storeNewValue( PhabricatorUser::getOmnipotentUser(), $config_entry, @@ -57,11 +58,11 @@ public function getTitle() { if ($this->getNewValue() === 'uninstalled') { return pht( - '%s uninstalled this application.', + '%s disabled this application.', $this->renderAuthor()); } else { return pht( - '%s installed this application.', + '%s enabled this application.', $this->renderAuthor()); } } @@ -69,12 +70,12 @@ public function getTitleForFeed() { if ($this->getNewValue() === 'uninstalled') { return pht( - '%s uninstalled %s.', + '%s disabled %s.', $this->renderAuthor(), $this->renderObject()); } else { return pht( - '%s installed %s.', + '%s enabled %s.', $this->renderAuthor(), $this->renderObject()); } diff --git a/src/applications/phame/site/PhameSite.php b/src/applications/phame/site/PhameSite.php --- a/src/applications/phame/site/PhameSite.php +++ b/src/applications/phame/site/PhameSite.php @@ -12,7 +12,7 @@ $phame_installed = PhabricatorApplication::isClassInstalled( PhabricatorPhameApplication::class); if (!$phame_installed) { - // Don't activate Phame if the the application is uninstalled. + // Don't activate Phame if the the application is disabled. return false; } diff --git a/src/applications/phid/type/PhabricatorPHIDType.php b/src/applications/phid/type/PhabricatorPHIDType.php --- a/src/applications/phid/type/PhabricatorPHIDType.php +++ b/src/applications/phid/type/PhabricatorPHIDType.php @@ -169,10 +169,10 @@ /** - * Get all PHID types of applications installed for a given viewer. + * Get all PHID types of applications enabled for a given viewer. * * @param PhabricatorUser $viewer Viewing user. - * @return array Map of constants to installed + * @return array Map of constants to enabled * types. */ public static function getAllInstalledTypes(PhabricatorUser $viewer) { @@ -186,12 +186,12 @@ if ($app_class === null) { // If the PHID type isn't bound to an application, include it as - // installed. + // enabled. $installed_types[$key] = $type; continue; } - // Otherwise, we need to check if this application is installed before + // Otherwise, we need to check if this application is enabled before // including the PHID type. $app_classes[$app_class][$key] = $type; } diff --git a/src/applications/project/menuitem/PhabricatorProjectPointsProfileMenuItem.php b/src/applications/project/menuitem/PhabricatorProjectPointsProfileMenuItem.php --- a/src/applications/project/menuitem/PhabricatorProjectPointsProfileMenuItem.php +++ b/src/applications/project/menuitem/PhabricatorProjectPointsProfileMenuItem.php @@ -26,7 +26,7 @@ return false; } - // Points are only available if Maniphest is installed. + // Points are only available if Maniphest is enabled. $class = PhabricatorManiphestApplication::class; if (!PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) { return false; diff --git a/src/applications/project/menuitem/PhabricatorProjectWorkboardProfileMenuItem.php b/src/applications/project/menuitem/PhabricatorProjectWorkboardProfileMenuItem.php --- a/src/applications/project/menuitem/PhabricatorProjectWorkboardProfileMenuItem.php +++ b/src/applications/project/menuitem/PhabricatorProjectWorkboardProfileMenuItem.php @@ -25,7 +25,7 @@ public function shouldEnableForObject($object) { $viewer = $this->getViewer(); - // Workboards are only available if Maniphest is installed. + // Workboards are only available if Maniphest is enabled. $class = PhabricatorManiphestApplication::class; if (!PhabricatorApplication::isClassInstalledForViewer($class, $viewer)) { return false; diff --git a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php --- a/src/applications/search/engine/PhabricatorApplicationSearchEngine.php +++ b/src/applications/search/engine/PhabricatorApplicationSearchEngine.php @@ -673,7 +673,7 @@ if (!$this->application) { throw new Exception( pht( - 'Application "%s" is not installed!', + 'Application "%s" is not enabled!', $class)); } } diff --git a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php --- a/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php +++ b/src/applications/search/fulltextstorage/PhabricatorFerretFulltextStorageEngine.php @@ -63,7 +63,7 @@ $search_engine = $engine->newSearchEngine() ->setViewer($viewer); - // Ignore result objects from SearchEngines belonging to uninstalled apps + // Ignore result objects from SearchEngines belonging to disabled apps $app_class = $search_engine->getApplicationClassName(); $app = PhabricatorApplication::isClassInstalled($app_class); if (!$app) { diff --git a/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php --- a/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php @@ -153,7 +153,7 @@ ->execute(); foreach ($editors as $key => $editor) { - // Remove editors for applications which are not installed. + // Remove editors for applications which are not enabled. $app = $editor->getEditorApplicationClass(); if ($app !== null && $user !== null) { if (!PhabricatorApplication::isClassInstalledForViewer($app, $user)) { diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php --- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php +++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php @@ -101,7 +101,7 @@ /** * Get the class name for the application this editor is a part of. * - * Uninstalling the application will disable the editor. + * Disabling the application will disable the editor. * * @return class-string Editor's application * class name. diff --git a/src/applications/conduit/protocol/exception/ConduitApplicationNotInstalledException.php b/src/applications/conduit/protocol/exception/ConduitApplicationNotInstalledException.php --- a/src/applications/conduit/protocol/exception/ConduitApplicationNotInstalledException.php +++ b/src/applications/conduit/protocol/exception/ConduitApplicationNotInstalledException.php @@ -6,7 +6,7 @@ public function __construct(ConduitAPIMethod $method, $application) { parent::__construct( pht( - "Method '%s' belongs to application '%s', which is not installed.", + "Method '%s' belongs to application '%s', which is not enabled.", $method->getAPIMethodName(), $application)); }