D14473.id34999.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14473.id34999.diff
View Options

	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
	@@ -839,9 +839,9 @@

	case self::TYPE_MERGED_FROM:
	return pht(
	- '%s merged %d task(s) %s into %s.',
	+ '%s merged %s task(s) %s into %s.',
	$this->renderHandleLink($author_phid),
	- count($new),
	+ phutil_count($new),
	$this->renderHandleList($new),
	$this->renderHandleLink($object_phid));

	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
	@@ -178,14 +178,14 @@
	),
	),

	- '%s merged %d task(s): %s.' => array(
	+ '%s merged %s task(s): %s.' => array(
	array(
	'%s merged a task: %3$s.',
	'%s merged tasks: %3$s.',
	),
	),

	- '%s merged %d task(s) %s into %s.' => array(
	+ '%s merged %s task(s) %s into %s.' => array(
	array(
	'%s merged %3$s into %4$s.',
	'%s merged tasks %3$s into %4$s.',