diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2014-01-27 04:54:30 -0800 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-01-27 04:54:30 -0800 |
| commit | 25305a535b37dfb8a64ef9565e303c87e5d46ca0 (patch) | |
| tree | 41054ab6173398ae0cf207f2873caf8626ab37a0 /core | |
| parent | d182b4f59fd7b172764a4d802dbd3ee6a953ea39 (diff) | |
| parent | 2bb13a8db96f8e17d04274b77f5062dca0df5b0e (diff) | |
| download | nextcloud-server-25305a535b37dfb8a64ef9565e303c87e5d46ca0.tar.gz nextcloud-server-25305a535b37dfb8a64ef9565e303c87e5d46ca0.zip | |
Merge pull request #6958 from owncloud/localised_date
use localised date in notification mails
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/share.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 268cd4f53a7..8b48effb458 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -121,7 +121,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo if (isset($items[0]['expiration'])) { try { $date = new DateTime($items[0]['expiration']); - $expiration = $date->format('Y-m-d'); + $expiration = $l->l('date', $date->getTimestamp()); } catch (Exception $e) { \OCP\Util::writeLog('sharing', "Couldn't read date: " . $e->getMessage(), \OCP\Util::ERROR); } @@ -187,6 +187,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo break; case 'email': + // enable l10n support + $l = OC_L10N::get('core'); // read post variables $user = OCP\USER::getUser(); $displayName = OCP\User::getDisplayName(); @@ -199,16 +201,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo if (isset($_POST['expiration']) && $_POST['expiration'] !== '') { try { $date = new DateTime($_POST['expiration']); - $expiration = $date->format('Y-m-d'); + $expiration = $l->l('date', $date->getTimestamp()); } catch (Exception $e) { \OCP\Util::writeLog('sharing', "Couldn't read date: " . $e->getMessage(), \OCP\Util::ERROR); } } - // enable l10n support - $l = OC_L10N::get('core'); - // setup the email $subject = (string)$l->t('%s shared »%s« with you', array($displayName, $file)); |