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 @@ -503,19 +503,19 @@ $removed = array_diff($old, $new); if ($added && !$removed) { return pht( - '%s attached %d file(s): %s', + '%s attached %d file(s): %s.', $this->renderHandleLink($author_phid), count($added), $this->renderHandleList($added)); } else if ($removed && !$added) { return pht( - '%s detached %d file(s): %s', + '%s detached %d file(s): %s.', $this->renderHandleLink($author_phid), count($removed), $this->renderHandleList($removed)); } else { return pht( - '%s changed file(s), attached %d: %s; detached %d: %s', + '%s changed file(s), attached %d: %s; detached %d: %s.', $this->renderHandleLink($author_phid), count($added), $this->renderHandleList($added), 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 @@ -328,7 +328,7 @@ $type, pht('Invalid'), pht( - '%d project hashtag(s) are already used: %s', + '%d project hashtag(s) are already used: %s.', count($used_slug_strs), implode(', ', $used_slug_strs)), $slug_xaction); 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 @@ -118,7 +118,7 @@ if ($add && $rem) { return pht( - '%s changed project hashtag(s), added %d: %s; removed %d: %s', + '%s changed project hashtag(s), added %d: %s; removed %d: %s.', $author_handle, count($add), $this->renderSlugList($add), @@ -126,13 +126,13 @@ $this->renderSlugList($rem)); } else if ($add) { return pht( - '%s added %d project hashtag(s): %s', + '%s added %d project hashtag(s): %s.', $author_handle, count($add), $this->renderSlugList($add)); } else if ($rem) { return pht( - '%s removed %d project hashtag(s): %s', + '%s removed %d project hashtag(s): %s.', $author_handle, count($rem), $this->renderSlugList($rem)); @@ -144,7 +144,7 @@ if ($add && $rem) { return pht( - '%s changed project member(s), added %d: %s; removed %d: %s', + '%s changed project member(s), added %d: %s; removed %d: %s.', $author_handle, count($add), $this->renderHandleList($add), @@ -157,7 +157,7 @@ $author_handle); } else { return pht( - '%s added %d project member(s): %s', + '%s added %d project member(s): %s.', $author_handle, count($add), $this->renderHandleList($add)); @@ -169,7 +169,7 @@ $author_handle); } else { return pht( - '%s removed %d project member(s): %s', + '%s removed %d project member(s): %s.', $author_handle, count($rem), $this->renderHandleList($rem)); diff --git a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php --- a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php +++ b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php @@ -131,7 +131,7 @@ ), '%s edited member(s), added %d: %s; removed %d: %s.' => - '%s edited members, added: %3$s; removed: %5$s', + '%s edited members, added: %3$s; removed: %5$s.', '%s added %d member(s): %s.' => array( array( @@ -148,7 +148,7 @@ ), '%s edited project(s), added %d: %s; removed %d: %s.' => - '%s edited projects, added: %3$s; removed: %5$s', + '%s edited projects, added: %3$s; removed: %5$s.', '%s added %d project(s): %s.' => array( array( @@ -249,19 +249,19 @@ ), '%s edited blocking task(s), added %s: %s; removed %s: %s.' => - '%s edited blocking tasks, added: %3$s; removed: %5$s', + '%s edited blocking tasks, added: %3$s; removed: %5$s.', '%s edited blocking task(s) for %s, added %s: %s; removed %s: %s.' => - '%s edited blocking tasks for %s, added: %4$s; removed: %6$s', + '%s edited blocking tasks for %s, added: %4$s; removed: %6$s.', '%s edited blocked task(s), added %s: %s; removed %s: %s.' => - '%s edited blocked tasks, added: %3$s; removed: %5$s', + '%s edited blocked tasks, added: %3$s; removed: %5$s.', '%s edited blocked task(s) for %s, added %s: %s; removed %s: %s.' => - '%s edited blocked tasks for %s, added: %4$s; removed: %6$s', + '%s edited blocked tasks for %s, added: %4$s; removed: %6$s.', '%s edited answer(s), added %s: %s; removed %d: %s.' => - '%s edited answers, added: %3$s; removed: %5$s', + '%s edited answers, added: %3$s; removed: %5$s.', '%s added %s answer(s): %s.' => array( array( @@ -278,7 +278,7 @@ ), '%s edited question(s), added %s: %s; removed %s: %s.' => - '%s edited questions, added: %3$s; removed: %5$s', + '%s edited questions, added: %3$s; removed: %5$s.', '%s added %s question(s): %s.' => array( array( @@ -295,7 +295,7 @@ ), '%s edited mock(s), added %d: %s; removed %d: %s.' => - '%s edited mocks, added: %3$s; removed: %5$s', + '%s edited mocks, added: %3$s; removed: %5$s.', '%s added %d mock(s): %s.' => array( array( @@ -326,7 +326,7 @@ ), '%s edited file(s), added %d: %s; removed %d: %s.' => - '%s edited files, added: %3$s; removed: %5$s', + '%s edited files, added: %3$s; removed: %5$s.', '%s added %d file(s): %s.' => array( array( @@ -343,7 +343,7 @@ ), '%s edited contributor(s), added %d: %s; removed %d: %s.' => - '%s edited contributors, added: %3$s; removed: %5$s', + '%s edited contributors, added: %3$s; removed: %5$s.', '%s added %d contributor(s): %s.' => array( array( @@ -360,7 +360,7 @@ ), '%s edited reviewer(s), added %s: %s; removed %s: %s.' => - '%s edited reviewers, added: %4$s; removed: %6$s', + '%s edited reviewers, added: %4$s; removed: %6$s.', '%s added %s reviewer(s): %s.' => array( array( @@ -377,7 +377,7 @@ ), '%s edited object(s), added %d: %s; removed %d: %s.' => - '%s edited objects, added: %3$s; removed: %5$s', + '%s edited objects, added: %3$s; removed: %5$s.', '%s added %d object(s): %s.' => array( array( @@ -399,7 +399,7 @@ ), '%s edited subscriber(s), added %d: %s; removed %d: %s.' => - '%s edited subscribers, added: %3$s; removed: %5$s', + '%s edited subscribers, added: %3$s; removed: %5$s.', '%s added %d subscriber(s): %s.' => array( array( @@ -416,7 +416,7 @@ ), '%s edited participant(s), added %d: %s; removed %d: %s.' => - '%s edited participants, added: %3$s; removed: %5$s', + '%s edited participants, added: %3$s; removed: %5$s.', '%s added %d participant(s): %s.' => array( array( @@ -551,36 +551,22 @@ '%s Commits', ), - '%s added %d project(s): %s' => array( + '%s attached %d file(s): %s.' => array( array( - '%s added a project: %3$s', - '%s added projects: %3$s', + '%s attached a file: %3$s.', + '%s attached files: %3$s.', ), ), - '%s removed %d project(s): %s' => array( + '%s detached %d file(s): %s.' => array( array( - '%s removed a project: %3$s', - '%s removed projects: %3$s', + '%s detached a file: %3$s.', + '%s detached files: %3$s.', ), ), - '%s attached %d file(s): %s' => array( - array( - '%s attached a file: %3$s', - '%s attached files: %3$s', - ), - ), - - '%s detached %d 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 files, attached: %3$s; detached: %5$s', + '%s changed file(s), attached %d: %s; detached %d: %s.' => + '%s changed files, attached: %3$s; detached: %5$s.', '%s added %s dependencie(s): %s.' => array( @@ -628,42 +614,42 @@ '%s edited commit(s), added %s: %s; removed %s: %s.' => '%s edited commits, added %3$s; removed %5$s.', - '%s changed project member(s), added %d: %s; removed %d: %s' => - '%s changed project members, added %3$s; removed %5$s', + '%s changed project member(s), added %d: %s; removed %d: %s.' => + '%s changed project members, added %3$s; removed %5$s.', - '%s added %d project member(s): %s' => array( + '%s added %d project member(s): %s.' => array( array( - '%s added a member: %3$s', - '%s added members: %3$s', + '%s added a member: %3$s.', + '%s added members: %3$s.', ), ), - '%s removed %d project member(s): %s' => array( + '%s removed %d project member(s): %s.' => array( array( - '%s removed a member: %3$s', - '%s removed members: %3$s', + '%s removed a member: %3$s.', + '%s removed members: %3$s.', ), ), - '%d project hashtag(s) are already used: %s' => array( + '%d project hashtag(s) are already used: %s.' => array( 'Project hashtag %2$s is already used.', - '%d project hashtags are already used: %2$s', + '%d project hashtags are already used: %2$s.', ), - '%s changed project hashtag(s), added %d: %s; removed %d: %s' => - '%s changed project hashtags, added %3$s; removed %5$s', + '%s changed project hashtag(s), added %d: %s; removed %d: %s.' => + '%s changed project hashtags, added %3$s; removed %5$s.', - '%s added %d project hashtag(s): %s' => array( + '%s added %d project hashtag(s): %s.' => array( array( - '%s added a hashtag: %3$s', - '%s added hashtags: %3$s', + '%s added a hashtag: %3$s.', + '%s added hashtags: %3$s.', ), ), - '%s removed %d project hashtag(s): %s' => array( + '%s removed %d project hashtag(s): %s.' => array( array( - '%s removed a hashtag: %3$s', - '%s removed hashtags: %3$s', + '%s removed a hashtag: %3$s.', + '%s removed hashtags: %3$s.', ), ),