diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-28 17:51:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 17:51:30 -0600 |
| commit | 1f7124a57bde8713c4bfa039d69d034b4b9f14cd (patch) | |
| tree | f91d4ae5af315ace6cbc1478e48a1536af930abf /lib | |
| parent | 9e1fdf4da55303baba28138189e05d47aea04ed3 (diff) | |
| parent | 644b37c7e4226593d8d2d450d6ce9d3a77798885 (diff) | |
| download | nextcloud-server-1f7124a57bde8713c4bfa039d69d034b4b9f14cd.tar.gz nextcloud-server-1f7124a57bde8713c4bfa039d69d034b4b9f14cd.zip | |
Merge pull request #4120 from nextcloud/newest-item-first-in-activity
Change the order on merging activities so the newest item is first
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Activity/EventMerger.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php index 91e79068665..04aa41b2690 100644 --- a/lib/private/Activity/EventMerger.php +++ b/lib/private/Activity/EventMerger.php @@ -201,25 +201,25 @@ class EventMerger implements IEventMerger { case 2: $replacement = $this->l10n->t( '%1$s and %2$s', - ['{' . $parameter . '1}', '{' . $parameter . '2}'] + ['{' . $parameter . '2}', '{' . $parameter . '1}'] ); break; case 3: $replacement = $this->l10n->t( '%1$s, %2$s and %3$s', - ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}'] + ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] ); break; case 4: $replacement = $this->l10n->t( '%1$s, %2$s, %3$s and %4$s', - ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}', '{' . $parameter . '4}'] + ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] ); break; case 5: $replacement = $this->l10n->t( '%1$s, %2$s, %3$s, %4$s and %5$s', - ['{' . $parameter . '1}', '{' . $parameter . '2}', '{' . $parameter . '3}', '{' . $parameter . '4}', '{' . $parameter . '5}'] + ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}'] ); break; default: |