diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-12 11:57:22 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-12 11:57:22 +0100 |
| commit | 7542883bf85165ea4178c86b7f04bfe71a9326e2 (patch) | |
| tree | 7ea16638d51a2ac4aeaa1937a0725f81d5ed1435 | |
| parent | 3bf0922b1337115c7cfc8a03547bc2d7d0d9fa69 (diff) | |
| parent | 811f9251d638c3e23d1d2f1d79afe91ef1975a7e (diff) | |
| download | nextcloud-server-7542883bf85165ea4178c86b7f04bfe71a9326e2.tar.gz nextcloud-server-7542883bf85165ea4178c86b7f04bfe71a9326e2.zip | |
Merge pull request #12807 from owncloud/fix-timespan-language
Correctly inject the language into the subcall
| -rw-r--r-- | lib/private/datetimeformatter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/datetimeformatter.php b/lib/private/datetimeformatter.php index 75e41259849..11c62f27083 100644 --- a/lib/private/datetimeformatter.php +++ b/lib/private/datetimeformatter.php @@ -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) { |