+1 -1

src/applications/console/plugin/DarkConsoleEventPlugin.php

reviewed

··· 7 7 } 8 8 9 9 public function getDescription() { 10 10 - return pht('Information about Phabricator events and event listeners.'); 10 10 + return pht('Information about events and event listeners.'); 11 11 } 12 12 13 13 public function generateData() {

+1 -1

src/applications/daemon/application/PhabricatorDaemonsApplication.php

reviewed

··· 7 7 } 8 8 9 9 public function getShortDescription() { 10 10 - return pht('Manage Phabricator Daemons'); 10 10 + return pht('Manage Daemons'); 11 11 } 12 12 13 13 public function getBaseURI() {

+3 -3

src/applications/daemon/management/PhabricatorDaemonManagementWorkflow.php

reviewed

··· 93 93 pht( 94 94 "You are trying to run a daemon as a nonstandard user, ". 95 95 "and `%s` was not able to `%s` to the correct user. \n". 96 96 - 'Phabricator is configured to run daemons as "%s", '. 96 96 + 'The daemons are configured to run as "%s", '. 97 97 'but the current user is "%s". '."\n". 98 98 'Use `%s` to run as a different user, pass `%s` to ignore this '. 99 99 'warning, or edit `%s` to change the configuration.', ··· 154 154 SIGINT, 155 155 array(__CLASS__, 'ignoreSignal')); 156 156 157 157 - echo "\n phabricator/scripts/daemon/ \$ {$command}\n\n"; 157 157 + echo "\n scripts/daemon/ \$ {$command}\n\n"; 158 158 159 159 $tempfile = new TempFile('daemon.config'); 160 160 Filesystem::writeFile($tempfile, json_encode($config)); ··· 579 579 $console->writeErr( 580 580 "%s\n", 581 581 pht( 582 582 - 'PID "%d" is not a known Phabricator daemon PID.', 582 582 + 'PID "%d" is not a known daemon PID.', 583 583 $pid)); 584 584 continue; 585 585 } else {

+1 -1

src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php

reviewed

··· 194 194 if (!$engine) { 195 195 throw new Exception( 196 196 pht( 197 197 - 'The application search engine "%s" is not known to Phabricator!', 197 197 + 'The application search engine "%s" is unknown.', 198 198 $class)); 199 199 } 200 200

+1 -1

src/applications/differential/parser/DifferentialChangesetParser.php

reviewed

··· 1816 1816 $viewstate = $this->getViewState(); 1817 1817 1818 1818 $engine_key = $viewstate->getDocumentEngineKey(); 1819 1819 - if (strlen($engine_key)) { 1819 1819 + if (phutil_nonempty_string($engine_key)) { 1820 1820 if (isset($shared_engines[$engine_key])) { 1821 1821 $document_engine = $shared_engines[$engine_key]; 1822 1822 } else {

+1 -1

src/applications/differential/render/DifferentialChangesetTestRenderer.php

reviewed

··· 76 76 $any_new = true; 77 77 } 78 78 $num = nonempty($p['line'], '-'); 79 79 - $render = $p['render']; 79 79 + $render = (string)$p['render']; 80 80 $htype = nonempty($p['htype'], '.'); 81 81 82 82 // TODO: This should probably happen earlier, whenever we deal with

+2 -2

src/applications/differential/storage/DifferentialDiff.php

reviewed

··· 550 550 'buildable.revision' => 551 551 pht('The differential revision ID, if applicable.'), 552 552 'repository.callsign' => 553 553 - pht('The callsign of the repository in Phabricator.'), 553 553 + pht('The callsign of the repository.'), 554 554 'repository.phid' => 555 555 - pht('The PHID of the repository in Phabricator.'), 555 555 + pht('The PHID of the repository.'), 556 556 'repository.vcs' => 557 557 pht('The version control system, either "svn", "hg" or "git".'), 558 558 'repository.uri' =>

+4 -4

src/applications/diffusion/management/DiffusionRepositoryURIsManagementPanel.php

reviewed

··· 130 130 $messages = array(); 131 131 if ($repository->isHosted()) { 132 132 if ($is_new) { 133 133 - $host_message = pht('Phabricator will host this repository.'); 133 133 + $host_message = pht('This repository will be hosted.'); 134 134 } else { 135 135 - $host_message = pht('Phabricator is hosting this repository.'); 135 135 + $host_message = pht('This repository is observed.'); 136 136 } 137 137 138 138 $messages[] = $host_message; 139 139 } else { 140 140 if ($is_new) { 141 141 $observe_message = pht( 142 142 - 'Phabricator will observe a remote repository.'); 142 142 + 'This repository will be observed.'); 143 143 } else { 144 144 $observe_message = pht( 145 145 - 'This repository is hosted remotely. Phabricator is observing it.'); 145 145 + 'This remote repository is being observed.'); 146 146 } 147 147 148 148 $messages[] = $observe_message;

+1 -1

src/applications/doorkeeper/worker/DoorkeeperFeedWorker.php

reviewed

··· 158 158 */ 159 159 final protected function doWork() { 160 160 if (PhabricatorEnv::getEnvConfig('phabricator.silent')) { 161 161 - $this->log("%s\n", pht('Phabricator is running in silent mode.')); 161 161 + $this->log("%s\n", pht('This software is running in silent mode.')); 162 162 return; 163 163 } 164 164

+1 -1

src/applications/feed/config/PhabricatorFeedConfigOptions.php

reviewed

··· 24 24 IMPORTANT: Feed hooks are deprecated and have been replaced by Webhooks. 25 25 26 26 You can configure Webhooks in Herald. This configuration option will be removed 27 27 - in a future version of Phabricator. 27 27 + in a future version of the software. 28 28 29 29 (This legacy option may be configured with a list of URIs; feed stories will 30 30 send to these URIs.)

+5

src/applications/files/document/PhabricatorDocumentRef.php

reviewed

··· 112 112 113 113 public function hasAnyMimeType(array $candidate_types) { 114 114 $mime_full = $this->getMimeType(); 115 115 + 116 116 + if (!phutil_nonempty_string($mime_full)) { 117 117 + return false; 118 118 + } 119 119 + 115 120 $mime_parts = explode(';', $mime_full); 116 121 117 122 $mime_type = head($mime_parts);

+6 -2

src/applications/files/document/PhabricatorJSONDocumentEngine.php

reviewed

··· 14 14 } 15 15 16 16 protected function getContentScore(PhabricatorDocumentRef $ref) { 17 17 - if (preg_match('/\.json\z/', $ref->getName())) { 18 18 - return 2000; 17 17 + 18 18 + $name = $ref->getName(); 19 19 + if ($name !== null) { 20 20 + if (preg_match('/\.json\z/', $name)) { 21 21 + return 2000; 22 22 + } 19 23 } 20 24 21 25 if ($ref->isProbablyJSON()) {

+5 -2

src/applications/files/document/PhabricatorRemarkupDocumentEngine.php

reviewed

··· 15 15 16 16 protected function getContentScore(PhabricatorDocumentRef $ref) { 17 17 $name = $ref->getName(); 18 18 - if (preg_match('/\\.remarkup\z/i', $name)) { 19 19 - return 2000; 18 18 + 19 19 + if ($name !== null) { 20 20 + if (preg_match('/\\.remarkup\z/i', $name)) { 21 21 + return 2000; 22 22 + } 20 23 } 21 24 22 25 return 500;

+8 -7

src/applications/guides/module/PhabricatorGuideInstallModule.php

reviewed

··· 7 7 } 8 8 9 9 public function getModuleName() { 10 10 - return pht('Install Phabricator'); 10 10 + return pht('Install'); 11 11 } 12 12 13 13 public function getModulePosition() { ··· 66 66 $icon_bg = 'bg-sky'; 67 67 $description = pht( 68 68 'Authentication providers allow users to register accounts and '. 69 69 - 'log in to Phabricator.'); 69 69 + 'log in.'); 70 70 } 71 71 72 72 $item = id(new PhabricatorGuideItemView()) ··· 78 78 $guide_items->addItem($item); 79 79 80 80 81 81 - $title = pht('Configure Phabricator'); 81 81 + $title = pht('Configure'); 82 82 $href = PhabricatorEnv::getURI('/config/'); 83 83 84 84 // Just load any config value at all; if one exists the install has figured ··· 95 95 $icon = 'fa-sliders'; 96 96 $icon_bg = 'bg-sky'; 97 97 $description = pht( 98 98 - 'Learn how to configure mail and other options in Phabricator.'); 98 98 + 'Learn how to configure mail and other options.'); 99 99 } 100 100 101 101 $item = id(new PhabricatorGuideItemView()) ··· 148 148 $icon = 'fa-bell'; 149 149 $icon_bg = 'bg-sky'; 150 150 $description = pht( 151 151 - 'Phabricator can deliver notifications in real-time with WebSockets.'); 151 151 + 'Real-time notifications can be delivered with WebSockets.'); 152 152 } 153 153 154 154 $item = id(new PhabricatorGuideItemView()) ··· 161 161 $guide_items->addItem($item); 162 162 163 163 $intro = pht( 164 164 - 'Phabricator has been successfully installed. These next guides will '. 164 164 + '%s has been successfully installed. These next guides will '. 165 165 'take you through configuration and new user orientation. '. 166 166 'These steps are optional, and you can go through them in any order. '. 167 167 'If you want to get back to this guide later on, you can find it in '. 168 168 - '{icon globe} **Applications** under {icon map-o} **Guides**.'); 168 168 + '{icon globe} **Applications** under {icon map-o} **Guides**.', 169 169 + PlatformSymbols::getPlatformServerName()); 169 170 170 171 $intro = new PHUIRemarkupView($viewer, $intro); 171 172

+5 -7

src/applications/guides/module/PhabricatorGuideQuickStartModule.php

reviewed

··· 132 132 $icon = 'fa-globe'; 133 133 $icon_bg = 'bg-sky'; 134 134 $description = 135 135 - pht('See all the applications included in Phabricator.'); 135 135 + pht('See all available applications.'); 136 136 137 137 $item = id(new PhabricatorGuideItemView()) 138 138 ->setTitle($title) ··· 159 159 $icon = 'fa-group'; 160 160 $icon_bg = 'bg-sky'; 161 161 $description = 162 162 - pht('Invite the rest of your team to get started on Phabricator.'); 162 162 + pht('Invite the rest of your team to get started.'); 163 163 } 164 164 165 165 $item = id(new PhabricatorGuideItemView()) ··· 172 172 } 173 173 174 174 $intro = pht( 175 175 - 'If you\'re new to Phabricator, these optional steps can help you learn '. 176 176 - 'the basics. Conceptually, Phabricator is structured as a graph, and '. 177 177 - 'repositories, tasks, and projects are all independent from each other. '. 178 178 - 'Feel free to set up Phabricator for how you work best, and explore '. 179 179 - 'these features at your own pace.'); 175 175 + 'If you\'re new to this software, these optional steps can help you '. 176 176 + 'learn the basics. Feel free to set things up for how you work best '. 177 177 + 'and explore these features at your own pace.'); 180 178 181 179 $intro = new PHUIRemarkupView($viewer, $intro); 182 180 $intro = id(new PHUIDocumentView())