From 185c28f307e404a0f729a10b04bb8024f4fb1193 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 9 Jul 2018 14:22:29 -0700 Subject: [PATCH] Update parent/child revision timeline messages to use modern language ("parent revision") Summary: See PHI746. See also T11833, perhaps. Ref T13151. Long ago, parent revisions were called "dependent revisions". This was changed to "parent revisions" in the action UI to improve clarity, but not changed in the timeline stories. Update the timeline stories to use the same language the actions in the UI use. Test Plan: {F5732876} {F5732877} Reviewers: amckinley Reviewed By: amckinley Maniphest Tasks: T13151 Differential Revision: https://secure.phabricator.com/D19514 --- ...alRevisionDependedOnByRevisionEdgeType.php | 12 ++-- ...ntialRevisionDependsOnRevisionEdgeType.php | 12 ++-- .../PhabricatorUSEnglishTranslation.php | 66 +++++++++++-------- 3 files changed, 50 insertions(+), 40 deletions(-) diff --git a/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php b/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php index a6940b536e..1f1adbc83a 100644 --- a/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php +++ b/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php @@ -33,7 +33,7 @@ final class DifferentialRevisionDependedOnByRevisionEdgeType $add_edges) { return pht( - '%s added %s dependent revision(s): %s.', + '%s added %s child revision(s): %s.', $actor, $add_count, $add_edges); @@ -45,7 +45,7 @@ final class DifferentialRevisionDependedOnByRevisionEdgeType $rem_edges) { return pht( - '%s removed %s dependent revision(s): %s.', + '%s removed %s child revision(s): %s.', $actor, $rem_count, $rem_edges); @@ -60,7 +60,7 @@ final class DifferentialRevisionDependedOnByRevisionEdgeType $rem_edges) { return pht( - '%s edited dependent revision(s), added %s: %s; removed %s: %s.', + '%s edited child revision(s), added %s: %s; removed %s: %s.', $actor, $add_count, $add_edges, @@ -75,7 +75,7 @@ final class DifferentialRevisionDependedOnByRevisionEdgeType $add_edges) { return pht( - '%s added %s dependent revision(s) for %s: %s.', + '%s added %s child revision(s) for %s: %s.', $actor, $add_count, $object, @@ -89,7 +89,7 @@ final class DifferentialRevisionDependedOnByRevisionEdgeType $rem_edges) { return pht( - '%s removed %s dependent revision(s) for %s: %s.', + '%s removed %s child revision(s) for %s: %s.', $actor, $rem_count, $object, @@ -106,7 +106,7 @@ final class DifferentialRevisionDependedOnByRevisionEdgeType $rem_edges) { return pht( - '%s edited dependent revision(s) for %s, added %s: %s; removed %s: %s.', + '%s edited child revision(s) for %s, added %s: %s; removed %s: %s.', $actor, $object, $add_count, diff --git a/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php b/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php index e826f554c6..a972b5359e 100644 --- a/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php +++ b/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php @@ -36,7 +36,7 @@ final class DifferentialRevisionDependsOnRevisionEdgeType $add_edges) { return pht( - '%s added %s dependencie(s): %s.', + '%s added %s parent revision(s): %s.', $actor, $add_count, $add_edges); @@ -48,7 +48,7 @@ final class DifferentialRevisionDependsOnRevisionEdgeType $rem_edges) { return pht( - '%s removed %s dependencie(s): %s.', + '%s removed %s parent revision(s): %s.', $actor, $rem_count, $rem_edges); @@ -63,7 +63,7 @@ final class DifferentialRevisionDependsOnRevisionEdgeType $rem_edges) { return pht( - '%s edited dependencie(s), added %s: %s; removed %s: %s.', + '%s edited parent revision(s), added %s: %s; removed %s: %s.', $actor, $add_count, $add_edges, @@ -78,7 +78,7 @@ final class DifferentialRevisionDependsOnRevisionEdgeType $add_edges) { return pht( - '%s added %s dependencie(s) for %s: %s.', + '%s added %s parent revision(s) for %s: %s.', $actor, $add_count, $object, @@ -92,7 +92,7 @@ final class DifferentialRevisionDependsOnRevisionEdgeType $rem_edges) { return pht( - '%s removed %s dependencie(s) for %s: %s.', + '%s removed %s parent revision(s) for %s: %s.', $actor, $rem_count, $object, @@ -109,7 +109,7 @@ final class DifferentialRevisionDependsOnRevisionEdgeType $rem_edges) { return pht( - '%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.', + '%s edited parent revision(s) for %s, added %s: %s; removed %s: %s.', $actor, $object, $add_count, diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php index a1e7ae4eae..c2241995e7 100644 --- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php +++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php @@ -595,70 +595,80 @@ final class PhabricatorUSEnglishTranslation '%s changed files, attached: %3$s; detached: %5$s.', - '%s added %s dependencie(s): %s.' => array( + '%s added %s parent revision(s): %s.' => array( array( - '%s added a dependency: %3$s.', - '%s added dependencies: %3$s.', + '%s added a parent revision: %3$s.', + '%s added parent revisions: %3$s.', ), ), - '%s added %s dependencie(s) for %s: %s.' => array( + '%s added %s parent revision(s) for %s: %s.' => array( array( - '%s added a dependency for %3$s: %4$s.', - '%s added dependencies for %3$s: %4$s.', + '%s added a parent revision for %3$s: %4$s.', + '%s added parent revisions for %3$s: %4$s.', ), ), - '%s removed %s dependencie(s): %s.' => array( + '%s removed %s parent revision(s): %s.' => array( array( - '%s removed a dependency: %3$s.', - '%s removed dependencies: %3$s.', + '%s removed a parent revision: %3$s.', + '%s removed parent revisions: %3$s.', ), ), - '%s removed %s dependencie(s) for %s: %s.' => array( + '%s removed %s parent revision(s) for %s: %s.' => array( array( - '%s removed a dependency for %3$s: %4$s.', - '%s removed dependencies for %3$s: %4$s.', + '%s removed a parent revision for %3$s: %4$s.', + '%s removed parent revisions for %3$s: %4$s.', ), ), - '%s edited dependencie(s), added %s: %s; removed %s: %s.' => array( - '%s edited dependencies, added: %3$s; removed: %5$s.', + '%s edited parent revision(s), added %s: %s; removed %s: %s.' => array( + '%s edited parent revisions, added: %3$s; removed: %5$s.', ), - '%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.' => array( - '%s edited dependencies for %s, added: %3$s; removed: %5$s.', + '%s edited parent revision(s) for %s, '. + 'added %s: %s; removed %s: %s.' => array( + '%s edited parent revisions for %s, added: %3$s; removed: %5$s.', ), - '%s added %s dependent revision(s): %s.' => array( + '%s added %s child revision(s): %s.' => array( array( - '%s added a dependent revision: %3$s.', - '%s added dependent revisions: %3$s.', + '%s added a child revision: %3$s.', + '%s added child revisions: %3$s.', ), ), - '%s added %s dependent revision(s) for %s: %s.' => array( + '%s added %s child revision(s) for %s: %s.' => array( array( - '%s added a dependent revision for %3$s: %4$s.', - '%s added dependent revisions for %3$s: %4$s.', + '%s added a child revision for %3$s: %4$s.', + '%s added child revisions for %3$s: %4$s.', ), ), - '%s removed %s dependent revision(s): %s.' => array( + '%s removed %s child revision(s): %s.' => array( array( - '%s removed a dependent revision: %3$s.', - '%s removed dependent revisions: %3$s.', + '%s removed a child revision: %3$s.', + '%s removed child revisions: %3$s.', ), ), - '%s removed %s dependent revision(s) for %s: %s.' => array( + '%s removed %s child revision(s) for %s: %s.' => array( array( - '%s removed a dependent revision for %3$s: %4$s.', - '%s removed dependent revisions for %3$s: %4$s.', + '%s removed a child revision for %3$s: %4$s.', + '%s removed child revisions for %3$s: %4$s.', ), ), + '%s edited child revision(s), added %s: %s; removed %s: %s.' => array( + '%s edited child revisions, added: %3$s; removed: %5$s.', + ), + + '%s edited child revision(s) for %s, '. + 'added %s: %s; removed %s: %s.' => array( + '%s edited child revisions for %s, added: %3$s; removed: %5$s.', + ), + '%s added %s commit(s): %s.' => array( array( '%s added a commit: %3$s.',