diff --git a/resources/sql/autopatches/20150602.mlist.2.php b/resources/sql/autopatches/20150602.mlist.2.php --- a/resources/sql/autopatches/20150602.mlist.2.php +++ b/resources/sql/autopatches/20150602.mlist.2.php @@ -40,7 +40,8 @@ if (!$username_okay) { echo pht( 'Failed to migrate mailing list "%s": unable to generate a unique '. - 'username for it.')."\n"; + 'username for it.', + $name)."\n"; continue; } diff --git a/src/applications/differential/management/PhabricatorDifferentialRebuildChangesetsWorkflow.php b/src/applications/differential/management/PhabricatorDifferentialRebuildChangesetsWorkflow.php --- a/src/applications/differential/management/PhabricatorDifferentialRebuildChangesetsWorkflow.php +++ b/src/applications/differential/management/PhabricatorDifferentialRebuildChangesetsWorkflow.php @@ -36,7 +36,8 @@ throw new PhutilArgumentUsageException( pht( 'Object "%s" specified by "--revision" must be a Differential '. - 'revision.')); + 'revision.', + $revision_identifier)); } } else { $revision = id(new DifferentialRevisionQuery()) diff --git a/src/applications/differential/xaction/DifferentialRevisionRepositoryTransaction.php b/src/applications/differential/xaction/DifferentialRevisionRepositoryTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionRepositoryTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionRepositoryTransaction.php @@ -84,7 +84,8 @@ $errors[] = $this->newInvalidError( pht( 'Repository "%s" is not a valid repository, or you do not have '. - 'permission to view it.'), + 'permission to view it.', + $new_value), $xaction); } } diff --git a/src/applications/fact/chart/PhabricatorChartFunctionArgumentParser.php b/src/applications/fact/chart/PhabricatorChartFunctionArgumentParser.php --- a/src/applications/fact/chart/PhabricatorChartFunctionArgumentParser.php +++ b/src/applications/fact/chart/PhabricatorChartFunctionArgumentParser.php @@ -43,6 +43,7 @@ pht( 'Chart function "%s" emitted an argument specification ("%s") with '. 'no type. Each argument specification must have a valid type.', + $this->getFunctionArgumentSignature(), $name)); } diff --git a/src/applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php b/src/applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php --- a/src/applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php +++ b/src/applications/harbormaster/management/HarbormasterManagementPublishWorkflow.php @@ -54,6 +54,7 @@ pht( 'Object "%s" is not a HarbormasterBuildable (it is a "%s"). '. 'Name one or more buildables to publish, like "B123".', + $name, get_class($result))); } } diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php --- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php +++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php @@ -177,6 +177,8 @@ pht( 'Attempt to load log bytes (%d - %d) failed: failed to '. 'load a single contiguous range. Actual ranges: %s.', + $offset, + $end, implode('; ', $display_ranges))); } diff --git a/src/applications/maniphest/constants/ManiphestTaskPriority.php b/src/applications/maniphest/constants/ManiphestTaskPriority.php --- a/src/applications/maniphest/constants/ManiphestTaskPriority.php +++ b/src/applications/maniphest/constants/ManiphestTaskPriority.php @@ -199,8 +199,7 @@ throw new Exception( pht( 'Configuration is not valid. Maniphest priority configurations '. - 'must be dictionaries.', - $config)); + 'must be dictionaries.')); } $all_keywords = array(); diff --git a/src/applications/metamta/adapter/PhabricatorMailAdapter.php b/src/applications/metamta/adapter/PhabricatorMailAdapter.php --- a/src/applications/metamta/adapter/PhabricatorMailAdapter.php +++ b/src/applications/metamta/adapter/PhabricatorMailAdapter.php @@ -65,6 +65,7 @@ pht( 'Adapter ("%s") is configured for medium "%s", but this is not '. 'a supported delivery medium. Supported media are: %s.', + get_class($this), $medium, implode(', ', $native_map))); } diff --git a/src/applications/notification/config/PhabricatorNotificationServersConfigType.php b/src/applications/notification/config/PhabricatorNotificationServersConfigType.php --- a/src/applications/notification/config/PhabricatorNotificationServersConfigType.php +++ b/src/applications/notification/config/PhabricatorNotificationServersConfigType.php @@ -98,7 +98,9 @@ 'Notification server configuration describes an invalid host '. '("%s", at index "%s"). This is an "admin" service but it has a '. '"path" property. This property is only valid for "client" '. - 'services.')); + 'services.', + $host, + $index)); } // We can't guarantee that you didn't just give the same host two diff --git a/src/applications/nuance/github/__tests__/NuanceGitHubRawEventTestCase.php b/src/applications/nuance/github/__tests__/NuanceGitHubRawEventTestCase.php --- a/src/applications/nuance/github/__tests__/NuanceGitHubRawEventTestCase.php +++ b/src/applications/nuance/github/__tests__/NuanceGitHubRawEventTestCase.php @@ -85,7 +85,8 @@ throw new Exception( pht( 'Expected test file "%s" to contain exactly two sections, '. - 'but it has more than two sections.')); + 'but it has more than two sections.', + $file)); } list($input, $expect) = $parts; diff --git a/src/applications/phragment/controller/PhragmentRevertController.php b/src/applications/phragment/controller/PhragmentRevertController.php --- a/src/applications/phragment/controller/PhragmentRevertController.php +++ b/src/applications/phragment/controller/PhragmentRevertController.php @@ -71,7 +71,6 @@ ->appendParagraph(pht( 'Reverting this fragment to version %d will create a new version of '. 'the fragment. It will not delete any version history.', - $version->getSequence(), $version->getSequence())); return id(new AphrontDialogResponse())->setDialog($dialog); } diff --git a/src/applications/policy/storage/PhabricatorPolicy.php b/src/applications/policy/storage/PhabricatorPolicy.php --- a/src/applications/policy/storage/PhabricatorPolicy.php +++ b/src/applications/policy/storage/PhabricatorPolicy.php @@ -266,8 +266,7 @@ return pht( 'Members of a particular project can take this action. (You '. 'can not see this object, so the name of this project is '. - 'restricted.)', - $handle->getFullName()); + 'restricted.)'); } else if ($type == PhabricatorPeopleUserPHIDType::TYPECONST) { return pht( '%s can take this action.', diff --git a/src/applications/project/icon/PhabricatorProjectIconSet.php b/src/applications/project/icon/PhabricatorProjectIconSet.php --- a/src/applications/project/icon/PhabricatorProjectIconSet.php +++ b/src/applications/project/icon/PhabricatorProjectIconSet.php @@ -224,6 +224,7 @@ 'Icon key "%s" is not a valid icon key. Icon keys must be 1-32 '. 'characters long and contain only lowercase letters. For example, '. '"%s" and "%s" are reasonable keys.', + $value['key'], 'tag', 'group')); } diff --git a/src/applications/search/ferret/function/FerretSearchFunction.php b/src/applications/search/ferret/function/FerretSearchFunction.php --- a/src/applications/search/ferret/function/FerretSearchFunction.php +++ b/src/applications/search/ferret/function/FerretSearchFunction.php @@ -17,7 +17,8 @@ pht( 'Ferret search engine function name ("%s") is invalid. Function '. 'names must be nonempty and may only contain latin letters and '. - 'hyphens.')); + 'hyphens.', + $function_name)); } } @@ -77,6 +78,7 @@ 'Ferret function "%s" is specified with a denormalized name. '. 'Instead, specify the function using the normalized '. 'function name ("%s").', + $function_name, $normal_name)); } diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php --- a/src/applications/transactions/editengine/PhabricatorEditEngine.php +++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php @@ -2548,7 +2548,9 @@ pht( 'Extension "%s" defines a bulk edit group with the same key '. '("%s") as the main editor or another extension. Each bulk '. - 'edit group must have a unique key.')); + 'edit group must have a unique key.', + get_class($extension), + $key)); } $map[$key] = $group; diff --git a/src/applications/transactions/editengine/PhabricatorEditEngineSubtype.php b/src/applications/transactions/editengine/PhabricatorEditEngineSubtype.php --- a/src/applications/transactions/editengine/PhabricatorEditEngineSubtype.php +++ b/src/applications/transactions/editengine/PhabricatorEditEngineSubtype.php @@ -204,7 +204,8 @@ pht( 'Subtype configuration is invalid: subtype with key "%s" '. 'specifies both child subtypes and child forms. Specify one '. - 'or the other, but not both.')); + 'or the other, but not both.', + $key)); } } diff --git a/src/infrastructure/cluster/PhabricatorDatabaseRefParser.php b/src/infrastructure/cluster/PhabricatorDatabaseRefParser.php --- a/src/infrastructure/cluster/PhabricatorDatabaseRefParser.php +++ b/src/infrastructure/cluster/PhabricatorDatabaseRefParser.php @@ -205,6 +205,8 @@ 'Database "%s" is configured as a replica and specifies a '. 'master ("%s"), but that master is not a valid master. Valid '. 'masters are: %s.', + $ref->getRefKey(), + $master_key, implode(', ', $master_keys))); } diff --git a/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php --- a/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php +++ b/src/infrastructure/customfield/datasource/PhabricatorCustomFieldApplicationSearchNoneFunctionDatasource.php @@ -22,7 +22,7 @@ 'summary' => pht('Find results with no value.'), 'description' => pht( "This function includes results which have no value. Use a query ". - "like this to find results with no value:\n\n%s\n\n", + "like this to find results with no value:\n\n%s\n\n". 'If you combine this function with other constraints, results '. 'which have no value or the specified values will be returned.', '> any()'),