D14474.diff
No OneTemporary
Actions

Size

38 KB

Referenced Files

None

Subscribers

None

D14474.diff
View Options

	diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	@@ -69,9 +69,9 @@
	}

	$message = $message."\n\n".pht(
	- 'This configuration value is defined in these %d '.
	+ 'This configuration value is defined in these %s '.
	'configuration source(s): %s.',
	- count($found),
	+ phutil_count($found),
	implode(', ', $found));
	$issue->setMessage($message);

	diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php
	--- a/src/applications/config/view/PhabricatorSetupIssueView.php
	+++ b/src/applications/config/view/PhabricatorSetupIssueView.php
	@@ -47,7 +47,7 @@

	$commands = $issue->getCommands();
	if ($commands) {
	- $run_these = pht('Run these %d command(s):', count($commands));
	+ $run_these = pht('Run these %s command(s):', phutil_count($commands));
	$description[] = phutil_tag(
	'div',
	array(
	@@ -62,7 +62,7 @@
	$extensions = $issue->getPHPExtensions();
	if ($extensions) {
	$install_these = pht(
	- 'Install these %d PHP extension(s):', count($extensions));
	+ 'Install these %s PHP extension(s):', phutil_count($extensions));

	$install_info = pht(
	'You can usually install a PHP extension using %s or %s. Common '.
	@@ -231,8 +231,8 @@
	'p',
	array(),
	pht(
	- 'The current Phabricator configuration has these %d value(s):',
	- count($configs)));
	+ 'The current Phabricator configuration has these %s value(s):',
	+ phutil_count($configs)));

	$options = PhabricatorApplicationConfigOptions::loadAllOptions();
	$hidden = array();
	@@ -259,9 +259,9 @@
	'p',
	array(),
	pht(
	- 'To update these %d value(s), run these command(s) from the command '.
	+ 'To update these %s value(s), run these command(s) from the command '.
	'line:',
	- count($configs)));
	+ phutil_count($configs)));

	$update = array();
	foreach ($configs as $key) {
	@@ -291,12 +291,16 @@
	$update_info = phutil_tag(
	'p',
	array(),
	- pht('You can update these %d value(s) here:', count($configs)));
	+ pht(
	+ 'You can update these %s value(s) here:',
	+ phutil_count($configs)));
	} else {
	$update_info = phutil_tag(
	'p',
	array(),
	- pht('These %d configuration value(s) are related:', count($configs)));
	+ pht(
	+ 'These %s configuration value(s) are related:',
	+ phutil_count($configs)));
	}
	} else {
	$update = null;
	@@ -322,8 +326,8 @@
	'p',
	array(),
	pht(
	- 'The current PHP configuration has these %d value(s):',
	- count($configs)));
	+ 'The current PHP configuration has these %s value(s):',
	+ phutil_count($configs)));

	$dict = array();
	foreach ($configs as $key) {
	@@ -365,16 +369,16 @@
	'p',
	array(),
	pht(
	- 'To update these %d value(s), edit your PHP configuration file.',
	- count($configs)));
	+ 'To update these %s value(s), edit your PHP configuration file.',
	+ phutil_count($configs)));
	} else {
	$info[] = phutil_tag(
	'p',
	array(),
	pht(
	- 'To update these %d value(s), edit your PHP configuration file, '.
	+ 'To update these %w value(s), edit your PHP configuration file, '.
	'located here:',
	- count($configs)));
	+ phutil_count($configs)));
	$info[] = phutil_tag(
	'pre',
	array(),
	@@ -465,8 +469,8 @@
	'p',
	array(),
	pht(
	- 'The current MySQL configuration has these %d value(s):',
	- count($config)));
	+ 'The current MySQL configuration has these %s value(s):',
	+ phutil_count($config)));

	return phutil_tag(
	'div',
	@@ -519,8 +523,8 @@
	'p',
	array(),
	pht(
	- '%d related link(s):',
	- count($links)));
	+ '%s related link(s):',
	+ phutil_count($links)));

	$link_list = array();
	foreach ($links as $link) {
	diff --git a/src/applications/conpherence/storage/ConpherenceTransaction.php b/src/applications/conpherence/storage/ConpherenceTransaction.php
	--- a/src/applications/conpherence/storage/ConpherenceTransaction.php
	+++ b/src/applications/conpherence/storage/ConpherenceTransaction.php
	@@ -94,23 +94,23 @@

	if ($add && $rem) {
	$title = pht(
	- '%s edited participant(s), added %d: %s; removed %d: %s.',
	+ '%s edited participant(s), added %s: %s; removed %s: %s.',
	$this->renderHandleLink($author_phid),
	- count($add),
	+ phutil_count($add),
	$this->renderHandleList($add),
	count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	$title = pht(
	- '%s added %d participant(s): %s.',
	+ '%s added %s participant(s): %s.',
	$this->renderHandleLink($author_phid),
	- count($add),
	+ phutil_count($add),
	$this->renderHandleList($add));
	} else {
	$title = pht(
	- '%s removed %d participant(s): %s.',
	+ '%s removed %s participant(s): %s.',
	$this->renderHandleLink($author_phid),
	- count($rem),
	+ phutil_count($rem),
	$this->renderHandleList($rem));
	}
	return $title;
	diff --git a/src/applications/differential/mail/DifferentialCreateMailReceiver.php b/src/applications/differential/mail/DifferentialCreateMailReceiver.php
	--- a/src/applications/differential/mail/DifferentialCreateMailReceiver.php
	+++ b/src/applications/differential/mail/DifferentialCreateMailReceiver.php
	@@ -76,8 +76,8 @@
	PhabricatorEnv::getEnvConfig('metamta.differential.subject-prefix');
	if (count($diffs)) {
	$subject = pht(
	- 'You successfully created %d diff(s).',
	- count($diffs));
	+ 'You successfully created %s diff(s).',
	+ phutil_count($diffs));
	} else {
	$subject = pht(
	'Diff creation failed; see body for %s error(s).',
	diff --git a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	--- a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	+++ b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
	@@ -498,9 +498,11 @@
	if ($is_large_block) {
	$is_first_block = ($top == 0);
	if ($is_first_block) {
	- $text = pht('Show First %d Line(s)', $block_size);
	+ $text = pht('Show First %s Line(s)', new PhutilNumber($block_size));
	} else {
	- $text = pht("\xE2\x96\xB2 Show %d Line(s)", $block_size);
	+ $text = pht(
	+ "\xE2\x96\xB2 Show %s Line(s)",
	+ new PhutilNumber($block_size));
	}

	$links[] = $this->renderShowContextLink(
	@@ -512,14 +514,16 @@
	$links[] = $this->renderShowContextLink(
	true,
	"{$top}-{$len}/{$top}-{$len}",
	- pht('Show All %d Line(s)', $len));
	+ pht('Show All %s Line(s)', new PhutilNumber($len)));

	if ($is_large_block) {
	$is_last_block = (($top + $len) >= $changeset_length);
	if ($is_last_block) {
	- $text = pht('Show Last %d Line(s)', $block_size);
	+ $text = pht('Show Last %s Line(s)', new PhutilNumber($block_size));
	} else {
	- $text = "\xE2\x96\xBC ".pht('Show %d Line(s)', $block_size);
	+ $text = "\xE2\x96\xBC ".pht(
	+ 'Show %s Line(s)',
	+ new PhutilNumber($block_size));
	}

	$links[] = $this->renderShowContextLink(
	diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	@@ -400,15 +400,17 @@

	$href = null;
	if ($this->getRequest()->getStr('lint') !== null) {
	- $lint_text = pht('Hide %d Lint Message(s)', count($this->lintMessages));
	+ $lint_text = pht(
	+ 'Hide %s Lint Message(s)',
	+ phutil_count($this->lintMessages));
	$href = $base_uri->alter('lint', null);

	} else if ($this->lintCommit === null) {
	$lint_text = pht('Lint not Available');
	} else {
	$lint_text = pht(
	- 'Show %d Lint Message(s)',
	- count($this->lintMessages));
	+ 'Show %s Lint Message(s)',
	+ phutil_count($this->lintMessages));
	$href = $this->getDiffusionRequest()->generateURI(array(
	'action' => 'browse',
	'commit' => $this->lintCommit,
	diff --git a/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php b/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php
	--- a/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php
	+++ b/src/applications/fact/management/PhabricatorFactManagementStatusWorkflow.php
	@@ -27,14 +27,14 @@
	'SELECT COUNT(*) N FROM %T',
	$name);

	- $n = $row['N'];
	+ $n = new PhutilNumber($row['N']);

	switch ($type) {
	case 'raw':
	- $desc = pht('There are %d raw fact(s) in storage.', $n);
	+ $desc = pht('There are %s raw fact(s) in storage.', $n);
	break;
	case 'agg':
	- $desc = pht('There are %d aggregate fact(s) in storage.', $n);
	+ $desc = pht('There are %s aggregate fact(s) in storage.', $n);
	break;
	}

	diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
	--- a/src/applications/maniphest/storage/ManiphestTransaction.php
	+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
	@@ -797,26 +797,26 @@
	$removed = array_diff($old, $new);
	if ($added && !$removed) {
	return pht(
	- '%s attached %d file(s) of %s: %s',
	+ '%s attached %s file(s) of %s: %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	- count($added),
	+ phutil_count($added),
	$this->renderHandleList($added));
	} else if ($removed && !$added) {
	return pht(
	- '%s detached %d file(s) of %s: %s',
	+ '%s detached %s file(s) of %s: %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	- count($removed),
	+ phutil_count($removed),
	$this->renderHandleList($removed));
	} else {
	return pht(
	- '%s changed file(s) for %s, attached %d: %s; detached %d: %s',
	+ '%s changed file(s) for %s, attached %s: %s; detached %s: %s',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	- count($added),
	+ phutil_count($added),
	$this->renderHandleList($added),
	- count($removed),
	+ phutil_count($removed),
	$this->renderHandleList($removed));
	}

	diff --git a/src/applications/pholio/storage/PholioTransaction.php b/src/applications/pholio/storage/PholioTransaction.php
	--- a/src/applications/pholio/storage/PholioTransaction.php
	+++ b/src/applications/pholio/storage/PholioTransaction.php
	@@ -166,9 +166,9 @@
	}

	return pht(
	- '%s added %d inline comment(s).',
	+ '%s added %s inline comment(s).',
	$this->renderHandleLink($author_phid),
	- $count);
	+ new PhutilNumber($count));
	break;
	case self::TYPE_IMAGE_REPLACE:
	return pht(
	@@ -183,23 +183,23 @@

	if ($add && $rem) {
	return pht(
	- '%s edited image(s), added %d: %s; removed %d: %s.',
	+ '%s edited image(s), added %s: %s; removed %s: %s.',
	$this->renderHandleLink($author_phid),
	- count($add),
	+ phutil_count($add),
	$this->renderHandleList($add),
	- count($rem),
	+ phutil_count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	return pht(
	- '%s added %d image(s): %s.',
	+ '%s added %s image(s): %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderHandleList($add));
	} else {
	return pht(
	- '%s removed %d image(s): %s.',
	+ '%s removed %s image(s): %s.',
	$this->renderHandleLink($author_phid),
	- count($rem),
	+ phutil_count($rem),
	$this->renderHandleList($rem));
	}
	break;
	@@ -214,13 +214,13 @@
	break;
	case self::TYPE_IMAGE_DESCRIPTION:
	return pht(
	- '%s updated an image\'s (%s) description.',
	+ "%s updated an image's (%s) description.",
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(key($new)));
	break;
	case self::TYPE_IMAGE_SEQUENCE:
	return pht(
	- '%s updated an image\'s (%s) sequence.',
	+ "%s updated an image's (%s) sequence.",
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(key($new)));
	break;
	diff --git a/src/applications/ponder/view/PonderFooterView.php b/src/applications/ponder/view/PonderFooterView.php
	--- a/src/applications/ponder/view/PonderFooterView.php
	+++ b/src/applications/ponder/view/PonderFooterView.php
	@@ -42,7 +42,7 @@
	} else {
	$icon = id(new PHUIIconView())
	->setIconFont('fa-comments msr');
	- $text = pht('Show %d Comment(s)', new PhutilNumber($this->count));
	+ $text = pht('Show %s Comment(s)', new PhutilNumber($this->count));
	}

	$actions = array();
	diff --git a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	--- a/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	+++ b/src/applications/project/editor/PhabricatorProjectTransactionEditor.php
	@@ -316,8 +316,8 @@
	$type,
	pht('Invalid'),
	pht(
	- '%d project hashtag(s) are already used: %s.',
	- count($used_slug_strs),
	+ '%s project hashtag(s) are already used: %s.',
	+ phutil_count($used_slug_strs),
	implode(', ', $used_slug_strs)),
	$slug_xaction);
	$errors[] = $error;
	diff --git a/src/applications/project/storage/PhabricatorProjectTransaction.php b/src/applications/project/storage/PhabricatorProjectTransaction.php
	--- a/src/applications/project/storage/PhabricatorProjectTransaction.php
	+++ b/src/applications/project/storage/PhabricatorProjectTransaction.php
	@@ -178,23 +178,23 @@

	if ($add && $rem) {
	return pht(
	- '%s changed project hashtag(s), added %d: %s; removed %d: %s.',
	+ '%s changed project hashtag(s), added %s: %s; removed %s: %s.',
	$author_handle,
	- count($add),
	+ phutil_count($add),
	$this->renderSlugList($add),
	- count($rem),
	+ phutil_count($rem),
	$this->renderSlugList($rem));
	} else if ($add) {
	return pht(
	- '%s added %d project hashtag(s): %s.',
	+ '%s added %s project hashtag(s): %s.',
	$author_handle,
	- count($add),
	+ phutil_count($add),
	$this->renderSlugList($add));
	} else if ($rem) {
	return pht(
	- '%s removed %d project hashtag(s): %s.',
	+ '%s removed %s project hashtag(s): %s.',
	$author_handle,
	- count($rem),
	+ phutil_count($rem),
	$this->renderSlugList($rem));
	}
	break;
	@@ -205,11 +205,11 @@

	if ($add && $rem) {
	return pht(
	- '%s changed project member(s), added %d: %s; removed %d: %s.',
	+ '%s changed project member(s), added %s: %s; removed %s: %s.',
	$author_handle,
	- count($add),
	+ phutil_count($add),
	$this->renderHandleList($add),
	- count($rem),
	+ phutil_count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	if (count($add) == 1 && (head($add) == $this->getAuthorPHID())) {
	@@ -218,9 +218,9 @@
	$author_handle);
	} else {
	return pht(
	- '%s added %d project member(s): %s.',
	+ '%s added %s project member(s): %s.',
	$author_handle,
	- count($add),
	+ phutil_count($add),
	$this->renderHandleList($add));
	}
	} else if ($rem) {
	@@ -230,9 +230,9 @@
	$author_handle);
	} else {
	return pht(
	- '%s removed %d project member(s): %s.',
	+ '%s removed %s project member(s): %s.',
	$author_handle,
	- count($rem),
	+ phutil_count($rem),
	$this->renderHandleList($rem));
	}
	}
	@@ -333,25 +333,25 @@

	if ($add && $rem) {
	return pht(
	- '%s changed %s hashtag(s), added %d: %s; removed %d: %s.',
	+ '%s changed %s hashtag(s), added %s: %s; removed %s: %s.',
	$author_handle,
	$object_handle,
	- count($add),
	+ phutil_count($add),
	$this->renderSlugList($add),
	- count($rem),
	+ phutil_count($rem),
	$this->renderSlugList($rem));
	} else if ($add) {
	return pht(
	- '%s added %d %s hashtag(s): %s.',
	+ '%s added %s %s hashtag(s): %s.',
	$author_handle,
	- count($add),
	+ phutil_count($add),
	$object_handle,
	$this->renderSlugList($add));
	} else if ($rem) {
	return pht(
	'%s removed %d %s hashtag(s): %s.',
	$author_handle,
	- count($rem),
	+ phutil_count($rem),
	$object_handle,
	$this->renderSlugList($rem));
	}
	diff --git a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php b/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
	--- a/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
	+++ b/src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
	@@ -72,9 +72,9 @@

	if ($commit_count) {
	$overview = pht(
	- '%s pushed %d commit(s) to %s.',
	+ '%s pushed %s commit(s) to %s.',
	$pusher_name,
	- $commit_count,
	+ new PhutilNumber($commit_count),
	$repo_name);
	} else {
	$overview = pht(
	diff --git a/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php b/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
	--- a/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
	+++ b/src/applications/search/management/PhabricatorSearchManagementIndexWorkflow.php
	@@ -87,7 +87,10 @@
	foreach ($groups as $group_type => $group) {
	$console->writeOut(
	"%s\n",
	- pht('Indexing %d object(s) of type %s.', count($group), $group_type));
	+ pht(
	+ 'Indexing %s object(s) of type %s.',
	+ phutil_count($group),
	+ $group_type));
	}

	$bar = id(new PhutilConsoleProgressBar())
	diff --git a/src/applications/subscriptions/view/SubscriptionListStringBuilder.php b/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	--- a/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	+++ b/src/applications/subscriptions/view/SubscriptionListStringBuilder.php
	@@ -64,7 +64,7 @@
	$show = array_values($show);

	$not_shown_count = $subscribers_count - $show_count;
	- $not_shown_txt = pht('%d other(s)', $not_shown_count);
	+ $not_shown_txt = pht('%s other(s)', new PhutilNumber($not_shown_count));
	$not_shown_link = javelin_tag(
	'a',
	array(
	diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	@@ -672,23 +672,23 @@

	if ($add && $rem) {
	return pht(
	- '%s edited subscriber(s), added %d: %s; removed %d: %s.',
	+ '%s edited subscriber(s), added %s: %s; removed %s: %s.',
	$this->renderHandleLink($author_phid),
	- count($add),
	+ phutil_count($add),
	$this->renderSubscriberList($add, 'add'),
	- count($rem),
	+ phutil_count($rem),
	$this->renderSubscriberList($rem, 'rem'));
	} else if ($add) {
	return pht(
	- '%s added %d subscriber(s): %s.',
	+ '%s added %s subscriber(s): %s.',
	$this->renderHandleLink($author_phid),
	- count($add),
	+ phutil_count($add),
	$this->renderSubscriberList($add, 'add'));
	} else if ($rem) {
	return pht(
	- '%s removed %d subscriber(s): %s.',
	+ '%s removed %s subscriber(s): %s.',
	$this->renderHandleLink($author_phid),
	- count($rem),
	+ phutil_count($rem),
	$this->renderSubscriberList($rem, 'rem'));
	} else {
	// This is used when rendering previews, before the user actually
	diff --git a/src/infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php b/src/infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php
	--- a/src/infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php
	+++ b/src/infrastructure/diff/view/PHUIDiffTableOfContentsItemView.php
	@@ -200,7 +200,7 @@
	return null;
	}

	- return ' '.pht('(%d line(s))', $line_count);
	+ return ' '.pht('(%s line(s))', new PhutilNumber($line_count));
	}

	private function renderCoverage() {
	diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	@@ -13,46 +13,32 @@
	'No daemon with id %s exists!',
	'No daemons with ids %s exist!',
	),
	- 'These %d configuration value(s) are related:' => array(
	+ 'These %s configuration value(s) are related:' => array(
	'This configuration value is related:',
	'These configuration values are related:',
	),
	'%s Task(s)' => array('Task', 'Tasks'),

	'%s ERROR(S)' => array('ERROR', 'ERRORS'),
	- '%d Error(s)' => array('%d Error', '%d Errors'),
	- '%d Warning(s)' => array('%d Warning', '%d Warnings'),
	- '%d Auto-Fix(es)' => array('%d Auto-Fix', '%d Auto-Fixes'),
	- '%d Advice(s)' => array('%d Advice', '%d Pieces of Advice'),
	- '%d Detail(s)' => array('%d Detail', '%d Details'),

	- '(%d line(s))' => array('(%d line)', '(%d lines)'),
	-
	- '%d line(s)' => array('%d line', '%d lines'),
	- '%d path(s)' => array('%d path', '%d paths'),
	- '%d diff(s)' => array('%d diff', '%d diffs'),
	+ '(%s line(s))' => array('(%s line)', '(%s lines)'),

	'%s Answer(s)' => array('%s Answer', '%s Answers'),
	- 'Show %d Comment(s)' => array('Show %d Comment', 'Show %d Comments'),
	+ 'Show %s Comment(s)' => array('Show %s Comment', 'Show %s Comments'),

	'%s DIFF LINK(S)' => array('DIFF LINK', 'DIFF LINKS'),
	- 'You successfully created %d diff(s).' => array(
	- 'You successfully created %d diff.',
	- 'You successfully created %d diffs.',
	+ 'You successfully created %s diff(s).' => array(
	+ 'You successfully created %s diff.',
	+ 'You successfully created %s diffs.',
	),
	'Diff creation failed; see body for %s error(s).' => array(
	'Diff creation failed; see body for error.',
	'Diff creation failed; see body for errors.',
	),

	- 'There are %d raw fact(s) in storage.' => array(
	- 'There is %d raw fact in storage.',
	- 'There are %d raw facts in storage.',
	- ),
	-
	- 'There are %d aggregate fact(s) in storage.' => array(
	- 'There is %d aggregate fact in storage.',
	- 'There are %d aggregate facts in storage.',
	+ 'There are %s aggregate fact(s) in storage.' => array(
	+ 'There is %s aggregate fact in storage.',
	+ 'There are %s aggregate facts in storage.',
	),

	'%d Commit(s) Awaiting Audit' => array(
	@@ -100,17 +86,17 @@
	'%d Assigned Tasks',
	),

	- 'Show %d Lint Message(s)' => array(
	- 'Show %d Lint Message',
	- 'Show %d Lint Messages',
	+ 'Show %s Lint Message(s)' => array(
	+ 'Show %s Lint Message',
	+ 'Show %s Lint Messages',
	),
	- 'Hide %d Lint Message(s)' => array(
	- 'Hide %d Lint Message',
	- 'Hide %d Lint Messages',
	+ 'Hide %s Lint Message(s)' => array(
	+ 'Hide %s Lint Message',
	+ 'Hide %s Lint Messages',
	),

	'This is a binary file. It is %s byte(s) in length.' => array(
	- 'This is a binary file. It is %s byte in length.',
	+ 'This is a binary file. It is %s byte in length.',
	'This is a binary file. It is %s bytes in length.',
	),

	@@ -129,22 +115,12 @@
	'Some of your actions have no effect:',
	),

	- 'Apply remaining %d action(s)?' => array(
	- 'Apply remaining action?',
	- 'Apply remaining actions?',
	- ),
	-
	- 'Apply %d Other Action(s)' => array(
	- 'Apply Remaining Action',
	- 'Apply Remaining Actions',
	- ),
	-
	'The %s action(s) you are taking have no effect:' => array(
	'The action you are taking has no effect:',
	'The actions you are taking have no effect:',
	),

	- '%s edited member(s), added %d: %s; removed %d: %s.' =>
	+ '%s edited member(s), added %s: %s; removed %s: %s.' =>
	'%s edited members, added: %3$s; removed: %5$s.',

	'%s added %s member(s): %s.' => array(
	@@ -407,12 +383,12 @@
	),
	),

	- '%d other(s)' => array(
	+ '%s other(s)' => array(
	'1 other',
	- '%d others',
	+ '%s others',
	),

	- '%s edited subscriber(s), added %d: %s; removed %d: %s.' =>
	+ '%s edited subscriber(s), added %s: %s; removed %s: %s.' =>
	'%s edited subscribers, added: %3$s; removed: %5$s.',

	'%s added %d subscriber(s): %s.' => array(
	@@ -446,34 +422,34 @@
	),
	),

	- '%s edited participant(s), added %d: %s; removed %d: %s.' =>
	+ '%s edited participant(s), added %s: %s; removed %s: %s.' =>
	'%s edited participants, added: %3$s; removed: %5$s.',

	- '%s added %d participant(s): %s.' => array(
	+ '%s added %s participant(s): %s.' => array(
	array(
	'%s added a participant: %3$s.',
	'%s added participants: %3$s.',
	),
	),

	- '%s removed %d participant(s): %s.' => array(
	+ '%s removed %s participant(s): %s.' => array(
	array(
	'%s removed a participant: %3$s.',
	'%s removed participants: %3$s.',
	),
	),

	- '%s edited image(s), added %d: %s; removed %d: %s.' =>
	+ '%s edited image(s), added %s: %s; removed %s: %s.' =>
	'%s edited images, added: %3$s; removed: %5$s',

	- '%s added %d image(s): %s.' => array(
	+ '%s added %s image(s): %s.' => array(
	array(
	'%s added an image: %3$s.',
	'%s added images: %3$s.',
	),
	),

	- '%s removed %d image(s): %s.' => array(
	+ '%s removed %s image(s): %s.' => array(
	array(
	'%s removed an image: %3$s.',
	'%s removed images: %3$s.',
	@@ -485,47 +461,47 @@
	'%s Lines',
	),

	- 'Indexing %d object(s) of type %s.' => array(
	- 'Indexing %d object of type %s.',
	- 'Indexing %d object of type %s.',
	+ 'Indexing %s object(s) of type %s.' => array(
	+ 'Indexing %s object of type %s.',
	+ 'Indexing %s object of type %s.',
	),

	- 'Run these %d command(s):' => array(
	+ 'Run these %s command(s):' => array(
	'Run this command:',
	'Run these commands:',
	),

	- 'Install these %d PHP extension(s):' => array(
	+ 'Install these %s PHP extension(s):' => array(
	'Install this PHP extension:',
	'Install these PHP extensions:',
	),

	- 'The current Phabricator configuration has these %d value(s):' => array(
	+ 'The current Phabricator configuration has these %s value(s):' => array(
	'The current Phabricator configuration has this value:',
	'The current Phabricator configuration has these values:',
	),

	- 'The current MySQL configuration has these %d value(s):' => array(
	+ 'The current MySQL configuration has these %s value(s):' => array(
	'The current MySQL configuration has this value:',
	'The current MySQL configuration has these values:',
	),

	- 'You can update these %d value(s) here:' => array(
	+ 'You can update these %s value(s) here:' => array(
	'You can update this value here:',
	'You can update these values here:',
	),

	- 'The current PHP configuration has these %d value(s):' => array(
	+ 'The current PHP configuration has these %s value(s):' => array(
	'The current PHP configuration has this value:',
	'The current PHP configuration has these values:',
	),

	- 'To update these %d value(s), edit your PHP configuration file.' => array(
	- 'To update this %d value, edit your PHP configuration file.',
	- 'To update these %d values, edit your PHP configuration file.',
	+ 'To update these %s value(s), edit your PHP configuration file.' => array(
	+ 'To update this value, edit your PHP configuration file.',
	+ 'To update these values, edit your PHP configuration file.',
	),

	- 'To update these %d value(s), edit your PHP configuration file, located '.
	+ 'To update these %s value(s), edit your PHP configuration file, located '.
	'here:' => array(
	'To update this value, edit your PHP configuration file, located '.
	'here:',
	@@ -538,12 +514,12 @@
	'PHP also loaded these configuration files:',
	),

	- 'You have %d unresolved setup issue(s)...' => array(
	+ 'You have %s unresolved setup issue(s)...' => array(
	'You have an unresolved setup issue...',
	- 'You have %d unresolved setup issues...',
	+ 'You have %s unresolved setup issues...',
	),

	- '%s added %d inline comment(s).' => array(
	+ '%s added %s inline comment(s).' => array(
	array(
	'%s added an inline comment.',
	'%s added inline comments.',
	@@ -554,11 +530,11 @@
	'%s rejection(s)' => array('%s rejection', '%s rejections'),
	'%s update(s)' => array('%s update', '%s updates'),

	- 'This configuration value is defined in these %d '.
	+ 'This configuration value is defined in these %s '.
	'configuration source(s): %s.' => array(
	'This configuration value is defined in this '.
	'configuration source: %2$s.',
	- 'This configuration value is defined in these %d '.
	+ 'This configuration value is defined in these %s '.
	'configuration sources: %s.',
	),

	@@ -582,21 +558,21 @@
	'%s Commits',
	),

	- '%s attached %d file(s): %s.' => array(
	+ '%s attached %s file(s): %s.' => array(
	array(
	'%s attached a file: %3$s.',
	'%s attached files: %3$s.',
	),
	),

	- '%s detached %d file(s): %s.' => array(
	+ '%s detached %s file(s): %s.' => array(
	array(
	'%s detached a file: %3$s.',
	'%s detached files: %3$s.',
	),
	),

	- '%s changed file(s), attached %d: %s; detached %d: %s.' =>
	+ '%s changed file(s), attached %s: %s; detached %s: %s.' =>
	'%s changed files, attached: %3$s; detached: %5$s.',


	@@ -749,70 +725,65 @@
	'%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited reverting commits for %s, added %4$s; removed %6$s.',

	- '%s changed project member(s), added %d: %s; removed %d: %s.' =>
	+ '%s changed project member(s), added %s: %s; removed %s: %s.' =>
	'%s changed project members, added %3$s; removed %5$s.',

	- '%s added %d project member(s): %s.' => array(
	+ '%s added %s project member(s): %s.' => array(
	array(
	'%s added a member: %3$s.',
	'%s added members: %3$s.',
	),
	),

	- '%s removed %d project member(s): %s.' => array(
	+ '%s removed %s project member(s): %s.' => array(
	array(
	'%s removed a member: %3$s.',
	'%s removed members: %3$s.',
	),
	),

	- '%d project hashtag(s) are already used: %s.' => array(
	- 'Project hashtag %2$s is already used.',
	- '%d project hashtags are already used: %2$s.',
	+ '%s project hashtag(s) are already used: %s.' => array(
	+ 'Project hashtag %2$s is already used.',
	+ '%s project hashtags are already used: %2$s.',
	),

	- '%s changed project hashtag(s), added %d: %s; removed %d: %s.' =>
	+ '%s changed project hashtag(s), added %s: %s; removed %s: %s.' =>
	'%s changed project hashtags, added %3$s; removed %5$s.',

	- '%s added %d project hashtag(s): %s.' => array(
	+ '%s added %s project hashtag(s): %s.' => array(
	array(
	'%s added a hashtag: %3$s.',
	'%s added hashtags: %3$s.',
	),
	),

	- '%s removed %d project hashtag(s): %s.' => array(
	+ '%s removed %s project hashtag(s): %s.' => array(
	array(
	'%s removed a hashtag: %3$s.',
	'%s removed hashtags: %3$s.',
	),
	),

	- '%s changed %s hashtag(s), added %d: %s; removed %d: %s.' =>
	+ '%s changed %s hashtag(s), added %s: %s; removed %s: %s.' =>
	'%s changed hashtags for %s, added %4$s; removed %6$s.',

	- '%s added %d %s hashtag(s): %s.' => array(
	+ '%s added %s %s hashtag(s): %s.' => array(
	array(
	'%s added a hashtag to %3$s: %4$s.',
	'%s added hashtags to %3$s: %4$s.',
	),
	),

	- '%s removed %d %s hashtag(s): %s.' => array(
	+ '%s removed %s %s hashtag(s): %s.' => array(
	array(
	'%s removed a hashtag from %3$s: %4$s.',
	'%s removed hashtags from %3$s: %4$s.',
	),
	),

	- '%d User(s) Need Approval' => array(
	- '%d User Needs Approval',
	- '%d Users Need Approval',
	- ),
	-
	- '%s older changes(s) are hidden.' => array(
	- '%d older change is hidden.',
	- '%d older changes are hidden.',
	+ '%s User(s) Need Approval' => array(
	+ '%s User Needs Approval',
	+ '%s Users Need Approval',
	),

	'%s, %s line(s)' => array(
	@@ -822,10 +793,10 @@
	),
	),

	- '%s pushed %d commit(s) to %s.' => array(
	+ '%s pushed %s commit(s) to %s.' => array(
	array(
	'%s pushed a commit to %3$s.',
	- '%s pushed %d commits to %s.',
	+ '%s pushed %s commits to %s.',
	),
	),

	@@ -855,7 +826,7 @@
	),
	),

	- '%s updated JIRA issue(s): added %s %s; removed %d %s.' =>
	+ '%s updated JIRA issue(s): added %s %s; removed %s %s.' =>
	'%s updated JIRA issues: added %3$s; removed %5$s.',

	'%s edited %s task(s), added %s: %s; removed %s: %s.' =>
	@@ -1037,12 +1008,12 @@
	'%s edited %s member(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited members for %3$s, added: %5$s; removed %7$s.',

	- '%d related link(s):' => array(
	+ '%s related link(s):' => array(
	'Related link:',
	'Related links:',
	),

	- 'You have %d unpaid invoice(s).' => array(
	+ 'You have %s unpaid invoice(s).' => array(
	'You have an unpaid invoice.',
	'You have unpaid invoices.',
	),
	@@ -1065,29 +1036,29 @@
	),
	),

	- 'Show First %d Line(s)' => array(
	+ 'Show First %s Line(s)' => array(
	'Show First Line',
	- 'Show First %d Lines',
	+ 'Show First %s Lines',
	),

	- "\xE2\x96\xB2 Show %d Line(s)" => array(
	+ "\xE2\x96\xB2 Show %s Line(s)" => array(
	"\xE2\x96\xB2 Show Line",
	- "\xE2\x96\xB2 Show %d Lines",
	+ "\xE2\x96\xB2 Show %s Lines",
	),

	- 'Show All %d Line(s)' => array(
	+ 'Show All %s Line(s)' => array(
	'Show Line',
	- 'Show All %d Lines',
	+ 'Show All %s Lines',
	),

	- "\xE2\x96\xBC Show %d Line(s)" => array(
	+ "\xE2\x96\xBC Show %s Line(s)" => array(
	"\xE2\x96\xBC Show Line",
	- "\xE2\x96\xBC Show %d Lines",
	+ "\xE2\x96\xBC Show %s Lines",
	),

	- 'Show Last %d Line(s)' => array(
	+ 'Show Last %s Line(s)' => array(
	'Show Last Line',
	- 'Show Last %d Lines',
	+ 'Show Last %s Lines',
	),

	'%s marked %s inline comment(s) as done and %s inline comment(s) as '.
	diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
	--- a/src/view/page/PhabricatorStandardPageView.php
	+++ b/src/view/page/PhabricatorStandardPageView.php
	@@ -423,7 +423,9 @@
	'href' => '/config/issue/',
	'title' => implode(', ', $open),
	),
	- pht('You have %d unresolved setup issue(s)...', count($open))));
	+ pht(
	+ 'You have %s unresolved setup issue(s)...',
	+ phutil_count($open))));
	}
	}

File Metadata

Mime Type: text/plain
Expires: Mar 8 2026, 1:46 AM (6 w, 3 d ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/vz/oz/kdafs2rd6hhhj6ne
Default Alt Text: D14474.diff (38 KB)

D14474.diffNo OneTemporaryActions

D14474.diffView Options

File Metadata

Event Timeline

D14474.diff
No OneTemporary
Actions

D14474.diff
View Options