From 960c0be6898c5502956cfb63f826ae4245739f1c Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 6 Nov 2016 10:45:58 -0800 Subject: [PATCH] Fix some issues with Phabricator i18n string extraction Summary: Ref T5267. Fix one minor bug (paths were not being resolved properly) and one minor string issue (missing `%d` in a string). Test Plan: Extracted strings, got a cleaner result. Reviewers: chad Reviewed By: chad Maniphest Tasks: T5267 Differential Revision: https://secure.phabricator.com/D16808 --- .../daemon/workers/storage/PhabricatorWorkerActiveTask.php | 2 +- ...PhabricatorInternationalizationManagementExtractWorkflow.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php index 0fcc78db6e..e1a6ef1500 100644 --- a/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php +++ b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php @@ -156,7 +156,7 @@ final class PhabricatorWorkerActiveTask extends PhabricatorWorkerTask { if ($this->getFailureCount() > $maximum_failures) { throw new PhabricatorWorkerPermanentFailureException( pht( - 'Task % has exceeded the maximum number of failures (%d).', + 'Task %d has exceeded the maximum number of failures (%d).', $this->getID(), $maximum_failures)); } diff --git a/src/infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php b/src/infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php index 1da2e16e27..35b2fc9bee 100644 --- a/src/infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php +++ b/src/infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php @@ -54,7 +54,7 @@ final class PhabricatorInternationalizationManagementExtractWorkflow } foreach ($libraries as $library) { - $targets[] = Filesystem::resolvePath(dirname($library)).'/'; + $targets[] = Filesystem::resolvePath(dirname($path.'/'.$library)).'/'; } }