sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4120 from nextcloud/newest-item-first-in-activity 

Change the order on merging activities so the newest item is first
pull/4132/head
Morris Jobke 2017-03-28 17:51:30 +07:00 committed by GitHub
parent 9e1fdf4da5 644b37c7e4
commit 1f7124a57b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/Activity/EventMerger.php
Unescape Escape View File

@ -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: