Skip to content

Commit 185c28f

Browse files
author
epriestley
committedJul 13, 2018
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
1 parent 4214b56 commit 185c28f

File tree

3 files changed

+50
-40
lines changed

3 files changed

+50
-40
lines changed
 

‎src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getTransactionAddString(
3333
$add_edges) {
3434

3535
return pht(
36-
'%s added %s dependent revision(s): %s.',
36+
'%s added %s child revision(s): %s.',
3737
$actor,
3838
$add_count,
3939
$add_edges);
@@ -45,7 +45,7 @@ public function getTransactionRemoveString(
4545
$rem_edges) {
4646

4747
return pht(
48-
'%s removed %s dependent revision(s): %s.',
48+
'%s removed %s child revision(s): %s.',
4949
$actor,
5050
$rem_count,
5151
$rem_edges);
@@ -60,7 +60,7 @@ public function getTransactionEditString(
6060
$rem_edges) {
6161

6262
return pht(
63-
'%s edited dependent revision(s), added %s: %s; removed %s: %s.',
63+
'%s edited child revision(s), added %s: %s; removed %s: %s.',
6464
$actor,
6565
$add_count,
6666
$add_edges,
@@ -75,7 +75,7 @@ public function getFeedAddString(
7575
$add_edges) {
7676

7777
return pht(
78-
'%s added %s dependent revision(s) for %s: %s.',
78+
'%s added %s child revision(s) for %s: %s.',
7979
$actor,
8080
$add_count,
8181
$object,
@@ -89,7 +89,7 @@ public function getFeedRemoveString(
8989
$rem_edges) {
9090

9191
return pht(
92-
'%s removed %s dependent revision(s) for %s: %s.',
92+
'%s removed %s child revision(s) for %s: %s.',
9393
$actor,
9494
$rem_count,
9595
$object,
@@ -106,7 +106,7 @@ public function getFeedEditString(
106106
$rem_edges) {
107107

108108
return pht(
109-
'%s edited dependent revision(s) for %s, added %s: %s; removed %s: %s.',
109+
'%s edited child revision(s) for %s, added %s: %s; removed %s: %s.',
110110
$actor,
111111
$object,
112112
$add_count,

‎src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function getTransactionAddString(
3636
$add_edges) {
3737

3838
return pht(
39-
'%s added %s dependencie(s): %s.',
39+
'%s added %s parent revision(s): %s.',
4040
$actor,
4141
$add_count,
4242
$add_edges);
@@ -48,7 +48,7 @@ public function getTransactionRemoveString(
4848
$rem_edges) {
4949

5050
return pht(
51-
'%s removed %s dependencie(s): %s.',
51+
'%s removed %s parent revision(s): %s.',
5252
$actor,
5353
$rem_count,
5454
$rem_edges);
@@ -63,7 +63,7 @@ public function getTransactionEditString(
6363
$rem_edges) {
6464

6565
return pht(
66-
'%s edited dependencie(s), added %s: %s; removed %s: %s.',
66+
'%s edited parent revision(s), added %s: %s; removed %s: %s.',
6767
$actor,
6868
$add_count,
6969
$add_edges,
@@ -78,7 +78,7 @@ public function getFeedAddString(
7878
$add_edges) {
7979

8080
return pht(
81-
'%s added %s dependencie(s) for %s: %s.',
81+
'%s added %s parent revision(s) for %s: %s.',
8282
$actor,
8383
$add_count,
8484
$object,
@@ -92,7 +92,7 @@ public function getFeedRemoveString(
9292
$rem_edges) {
9393

9494
return pht(
95-
'%s removed %s dependencie(s) for %s: %s.',
95+
'%s removed %s parent revision(s) for %s: %s.',
9696
$actor,
9797
$rem_count,
9898
$object,
@@ -109,7 +109,7 @@ public function getFeedEditString(
109109
$rem_edges) {
110110

111111
return pht(
112-
'%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.',
112+
'%s edited parent revision(s) for %s, added %s: %s; removed %s: %s.',
113113
$actor,
114114
$object,
115115
$add_count,

‎src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php

+38-28
Original file line numberDiff line numberDiff line change
@@ -595,70 +595,80 @@ protected function getTranslations() {
595595
'%s changed files, attached: %3$s; detached: %5$s.',
596596

597597

598-
'%s added %s dependencie(s): %s.' => array(
598+
'%s added %s parent revision(s): %s.' => array(
599599
array(
600-
'%s added a dependency: %3$s.',
601-
'%s added dependencies: %3$s.',
600+
'%s added a parent revision: %3$s.',
601+
'%s added parent revisions: %3$s.',
602602
),
603603
),
604604

605-
'%s added %s dependencie(s) for %s: %s.' => array(
605+
'%s added %s parent revision(s) for %s: %s.' => array(
606606
array(
607-
'%s added a dependency for %3$s: %4$s.',
608-
'%s added dependencies for %3$s: %4$s.',
607+
'%s added a parent revision for %3$s: %4$s.',
608+
'%s added parent revisions for %3$s: %4$s.',
609609
),
610610
),
611611

612-
'%s removed %s dependencie(s): %s.' => array(
612+
'%s removed %s parent revision(s): %s.' => array(
613613
array(
614-
'%s removed a dependency: %3$s.',
615-
'%s removed dependencies: %3$s.',
614+
'%s removed a parent revision: %3$s.',
615+
'%s removed parent revisions: %3$s.',
616616
),
617617
),
618618

619-
'%s removed %s dependencie(s) for %s: %s.' => array(
619+
'%s removed %s parent revision(s) for %s: %s.' => array(
620620
array(
621-
'%s removed a dependency for %3$s: %4$s.',
622-
'%s removed dependencies for %3$s: %4$s.',
621+
'%s removed a parent revision for %3$s: %4$s.',
622+
'%s removed parent revisions for %3$s: %4$s.',
623623
),
624624
),
625625

626-
'%s edited dependencie(s), added %s: %s; removed %s: %s.' => array(
627-
'%s edited dependencies, added: %3$s; removed: %5$s.',
626+
'%s edited parent revision(s), added %s: %s; removed %s: %s.' => array(
627+
'%s edited parent revisions, added: %3$s; removed: %5$s.',
628628
),
629629

630-
'%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.' => array(
631-
'%s edited dependencies for %s, added: %3$s; removed: %5$s.',
630+
'%s edited parent revision(s) for %s, '.
631+
'added %s: %s; removed %s: %s.' => array(
632+
'%s edited parent revisions for %s, added: %3$s; removed: %5$s.',
632633
),
633634

634-
'%s added %s dependent revision(s): %s.' => array(
635+
'%s added %s child revision(s): %s.' => array(
635636
array(
636-
'%s added a dependent revision: %3$s.',
637-
'%s added dependent revisions: %3$s.',
637+
'%s added a child revision: %3$s.',
638+
'%s added child revisions: %3$s.',
638639
),
639640
),
640641

641-
'%s added %s dependent revision(s) for %s: %s.' => array(
642+
'%s added %s child revision(s) for %s: %s.' => array(
642643
array(
643-
'%s added a dependent revision for %3$s: %4$s.',
644-
'%s added dependent revisions for %3$s: %4$s.',
644+
'%s added a child revision for %3$s: %4$s.',
645+
'%s added child revisions for %3$s: %4$s.',
645646
),
646647
),
647648

648-
'%s removed %s dependent revision(s): %s.' => array(
649+
'%s removed %s child revision(s): %s.' => array(
649650
array(
650-
'%s removed a dependent revision: %3$s.',
651-
'%s removed dependent revisions: %3$s.',
651+
'%s removed a child revision: %3$s.',
652+
'%s removed child revisions: %3$s.',
652653
),
653654
),
654655

655-
'%s removed %s dependent revision(s) for %s: %s.' => array(
656+
'%s removed %s child revision(s) for %s: %s.' => array(
656657
array(
657-
'%s removed a dependent revision for %3$s: %4$s.',
658-
'%s removed dependent revisions for %3$s: %4$s.',
658+
'%s removed a child revision for %3$s: %4$s.',
659+
'%s removed child revisions for %3$s: %4$s.',
659660
),
660661
),
661662

663+
'%s edited child revision(s), added %s: %s; removed %s: %s.' => array(
664+
'%s edited child revisions, added: %3$s; removed: %5$s.',
665+
),
666+
667+
'%s edited child revision(s) for %s, '.
668+
'added %s: %s; removed %s: %s.' => array(
669+
'%s edited child revisions for %s, added: %3$s; removed: %5$s.',
670+
),
671+
662672
'%s added %s commit(s): %s.' => array(
663673
array(
664674
'%s added a commit: %3$s.',

0 commit comments

Comments
 (0)
Failed to load comments.