revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-29 10:12:41 +01:00
Code Issues Releases Wiki Activity

Fix wrong plural of an arc land message

Browse source 
Summary:
"Branch" was pluralized as "branchs".

Fixes T9225.

Test Plan:
* Created test repo with two revisions on a feature branch.
* Saw old message, frowned a little.
* Applied patch.
* No longer frowning.

Reviewers: chad, epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: avivey, Korvin

Maniphest Tasks: T9225

Differential Revision: https://secure.phabricator.com/D13944
This commit is contained in:
Javier Arteaga 2015-08-20 04:19:22 -07:00 committed by epriestley
parent 05aaa1a5a3
commit f47d15387b
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/workflow/ArcanistLandWorkflow.php
View file

@ -492,17 +492,34 @@ EOTEXT
'arc amend', 'arc amend',
'--revision <id>')); '--revision <id>'));
} else if (count($revisions) > 1) { } else if (count($revisions) > 1) {
switch ($this->branchType) {
case self::REFTYPE_BOOKMARK:
$message = pht( $message = pht(
"There are multiple revisions on feature %s '%s' which are not ". "There are multiple revisions on feature bookmark '%s' which are ".
"present on '%s':\n\n". "not present on '%s':\n\n".
"%s\n". "%s\n".
"Separate these revisions onto different %s, or use --revision <id>' ". 'Separate these revisions onto different bookmarks, or use '.
"to use the commit message from <id> and land them all.", '--revision <id> to use the commit message from <id> '.
$this->branchType, 'and land them all.',
$this->branch, $this->branch,
$this->onto, $this->onto,
$this->renderRevisionList($revisions), $this->renderRevisionList($revisions));
$this->branchType.'s'); break;
case self::REFTYPE_BRANCH:
default:
$message = pht(
"There are multiple revisions on feature branch '%s' which are ".
"not present on '%s':\n\n".
"%s\n".
'Separate these revisions onto different branches, or use '.
'--revision <id> to use the commit message from <id> '.
'and land them all.',
$this->branch,
$this->onto,
$this->renderRevisionList($revisions));
break;
}
throw new ArcanistUsageException($message); throw new ArcanistUsageException($message);
} }