@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix reverting commit language

Summary: I think the language here is inverted? On a commit which is reverted, the text states `$author added a reverted commit: $commit`. In reality, `$commit` is the //reverting// commit, not the //reverted// commit.

Test Plan: Think about English.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D13067

+12 -12
+6 -6
src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php
··· 19 19 $add_edges) { 20 20 21 21 return pht( 22 - '%s added %s reverted commit(s): %s.', 22 + '%s added %s reverting commit(s): %s.', 23 23 $actor, 24 24 $add_count, 25 25 $add_edges); ··· 31 31 $rem_edges) { 32 32 33 33 return pht( 34 - '%s removed %s reverted commit(s): %s.', 34 + '%s removed %s reverting commit(s): %s.', 35 35 $actor, 36 36 $rem_count, 37 37 $rem_edges); ··· 46 46 $rem_edges) { 47 47 48 48 return pht( 49 - '%s edited reverted commit(s), added %s: %s; removed %s: %s.', 49 + '%s edited reverting commit(s), added %s: %s; removed %s: %s.', 50 50 $actor, 51 51 $add_count, 52 52 $add_edges, ··· 61 61 $add_edges) { 62 62 63 63 return pht( 64 - '%s added %s reverted commit(s) for %s: %s.', 64 + '%s added %s reverting commit(s) for %s: %s.', 65 65 $actor, 66 66 $add_count, 67 67 $object, ··· 75 75 $rem_edges) { 76 76 77 77 return pht( 78 - '%s removed %s reverted commit(s) for %s: %s.', 78 + '%s removed %s reverting commit(s) for %s: %s.', 79 79 $actor, 80 80 $rem_count, 81 81 $object, ··· 92 92 $rem_edges) { 93 93 94 94 return pht( 95 - '%s edited reverted commit(s) for %s, added %s: %s; removed %s: %s.', 95 + '%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.', 96 96 $actor, 97 97 $object, 98 98 $add_count,
+6 -6
src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php
··· 22 22 $add_edges) { 23 23 24 24 return pht( 25 - '%s added %s reverting commit(s): %s.', 25 + '%s added %s reverted commit(s): %s.', 26 26 $actor, 27 27 $add_count, 28 28 $add_edges); ··· 34 34 $rem_edges) { 35 35 36 36 return pht( 37 - '%s removed %s reverting commit(s): %s.', 37 + '%s removed %s reverted commit(s): %s.', 38 38 $actor, 39 39 $rem_count, 40 40 $rem_edges); ··· 49 49 $rem_edges) { 50 50 51 51 return pht( 52 - '%s edited reverting commit(s), added %s: %s; removed %s: %s.', 52 + '%s edited reverted commit(s), added %s: %s; removed %s: %s.', 53 53 $actor, 54 54 $add_count, 55 55 $add_edges, ··· 64 64 $add_edges) { 65 65 66 66 return pht( 67 - '%s added %s reverting commit(s) for %s: %s.', 67 + '%s added %s reverted commit(s) for %s: %s.', 68 68 $actor, 69 69 $add_count, 70 70 $object, ··· 78 78 $rem_edges) { 79 79 80 80 return pht( 81 - '%s removed %s reverting commit(s) for %s: %s.', 81 + '%s removed %s reverted commit(s) for %s: %s.', 82 82 $actor, 83 83 $rem_count, 84 84 $object, ··· 95 95 $rem_edges) { 96 96 97 97 return pht( 98 - '%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.', 98 + '%s edited reverted commit(s) for %s, added %s: %s; removed %s: %s.', 99 99 $actor, 100 100 $object, 101 101 $add_count,