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 #12807 from owncloud/fix-timespan-language 

Correctly inject the language into the subcall
remotes/origin/fix-10825
Joas Schilling 2014-12-12 11:57:22 +07:00
parent 3bf0922b13 811f9251d6
commit 7542883bf8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/datetimeformatter.php
Unescape Escape View File

@ -203,7 +203,7 @@ class DateTimeFormatter implements \OCP\IDateTimeFormatter {
$diff = $timestamp->diff($baseTimestamp);
if ($diff->y > 0 || $diff->m > 0 || $diff->d > 0) {
return (string) $this->formatDateSpan($timestamp, $baseTimestamp);
return (string) $this->formatDateSpan($timestamp, $baseTimestamp, $l);
}
if ($diff->h > 0) {