recaptime.dev / phorge
@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 some edge strings; particularly revision editing

Summary:
These didn't get translated quite right:

- We need to use `$total_count` because some languages have different words for 1, 2-3, and 4+ things (for example). So the strings might translate as:
- alincoln added a reviewer-one ...
- alincoln added reviewers-few ...
- alincoln added reviewers-many ...
- That is, while English has only "reviewer" and "reviewers", other languages have more plural forms, and "reviewer", "reviewers-few" and "reviewers-many" may be completely different words.
- In English, because we know we always have 2+ in this branch and the only special word is for 1, we can just drop this.
- Anyway, the %4$s stuff is counting assuming that $total_count is included in the string, so these were a off by one.
- See also D11160.

There a probably a couple more of these, but they should be easy enough to hunt down as they crop up.

Test Plan: Saw nice strings instead of empty strings, or invalid strings (after D11160).

Reviewers: joshuaspence, btrahan

Reviewed By: btrahan

Subscribers: epriestley

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

epriestley 7cbaad5c 61e26cd2

+8 -3
+4 -2
src/applications/differential/edge/DifferentialRevisionHasReviewerEdgeType.php
··· 46 46 $rem_edges) { 47 47 48 48 return pht( 49 - '%s edited reviewer(s), added %s: %s; removed %s: %s.', 49 + '%s edited %s reviewer(s), added %s: %s; removed %s: %s.', 50 50 $actor, 51 + $total_count, 51 52 $add_count, 52 53 $add_edges, 53 54 $rem_count, ··· 92 93 $rem_edges) { 93 94 94 95 return pht( 95 - '%s edited reviewer(s) for %s, added %s: %s; removed %s: %s.', 96 + '%s edited %s reviewer(s) for %s, added %s: %s; removed %s: %s.', 96 97 $actor, 98 + $total_count, 97 99 $object, 98 100 $add_count, 99 101 $add_edges,
+4 -1
src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
··· 359 359 ), 360 360 ), 361 361 362 - '%s edited reviewer(s), added %s: %s; removed %s: %s.' => 362 + '%s edited %s reviewer(s), added %s: %s; removed %s: %s.' => 363 363 '%s edited reviewers, added: %4$s; removed: %6$s.', 364 + 365 + '%s edited %s reviewer(s) for %s, added %s: %s; removed %s: %s.' => 366 + '%s edited reviewers for %3$s, added: %5$s; removed: %7$s.', 364 367 365 368 '%s added %s reviewer(s): %s.' => array( 366 369 array(