Add Temporal::utcNow()

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 44fca484cc1f17cea5d582d760b13b0af6386b38..cf219676ecf4220b9bcb9079c6a837260847fda7 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -2,13 +2,14 @@
 /**
  * @file include/enotify.php
  */
-use Friendica\App;
+
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Util\Emailer;
+use Friendica\Util\Temporal;
 
 require_once 'include/bbcode.php';
 require_once 'include/html2bbcode.php';
@@ -347,7 +348,7 @@ function notification($params)
                                '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
                        );
 
-                       $body =  L10n::t('\'%1$s\' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
+                       $body =  L10n::t('\'%1$s\' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.', $params['source_name']);
                        $body .= "\n\n";
                        $body .= L10n::t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future.', $params['source_name']);
 
@@ -369,7 +370,7 @@ function notification($params)
                                        '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
                                );
 
-                               $body = L10n::t('Full Name:     %1$s\nSite Location:    %2$s\nLogin Name:       %3$s (%4$s)',
+                               $body = L10n::t('Full Name:     %1$s\nSite Location:    %2$s\nLogin Name:       %3$s ' . "\x28" . '%4$s' . "\x28",
                                        $params['source_name'],
                                        $siteurl, $params['source_mail'],
                                        $params['source_nick']
@@ -450,7 +451,7 @@ function notification($params)
                $datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
                $datarray['url']   = $params['source_link'];
                $datarray['photo'] = $params['source_photo'];
-               $datarray['date']  = datetime_convert();
+               $datarray['date']  = Temporal::utcNow();
                $datarray['uid']   = $params['uid'];
                $datarray['link']  = $itemlink;
                $datarray['iid']   = $item_id;