update NL translations THX Pascal

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index d1c7dc1f41ad153bf57a07a99a94836f4159eebb..257c10720781874e22c4d1b94055f33b74194758 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -45,10 +45,7 @@ function notification($params)
                $hostname = substr($hostname, 0, strpos($hostname, ':'));
        }
 
-       $sender_email = $a->config['sender_email'];
-       if (empty($sender_email)) {
-               $sender_email = L10n::t('noreply').'@'.$hostname;
-       }
+       $sender_email = $a->getSenderEmailAddress();
 
        if ($params['type'] != SYSTEM_EMAIL) {
                $user = dba::selectFirst('user', ['nickname', 'page-flags'],
@@ -155,7 +152,7 @@ function notification($params)
                }
 
                // "your post"
-               if (DBM::is_result($item) && $item['owner-name'] == $item['author-name'] && $item['wall']) {
+               if (DBM::is_result($item) && $item['owner-id'] == $item['author-id'] && $item['wall']) {
                        $dest_str = L10n::t('%1$s commented on [url=%2$s]your %3$s[/url]',
                                '[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
                                $itemlink,
@@ -360,7 +357,7 @@ function notification($params)
        if ($params['type'] == NOTIFY_SYSTEM) {
                switch($params['event']) {
                        case "SYSTEM_REGISTER_REQUEST":
-                               $subject = L10n::t('[Friendica System:Notify] registration request');
+                               $subject = L10n::t('[Friendica System Notify]') . ' ' . L10n::t('registration request');
 
                                $preamble = L10n::t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
                                $epreamble = L10n::t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.',