From 536c037bfa6a04a2a08db94330c9a12fe22cd6cb Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Tue, 21 Feb 2012 22:53:22 -0800 Subject: Fixes #4335. Cleaned up the notifications for new content. --- mod/blog/languages/en.php | 11 ++++++++++- mod/blog/start.php | 17 ++++++++--------- mod/bookmarks/languages/en.php | 11 ++++++++++- mod/bookmarks/start.php | 24 +++++++++--------------- mod/file/languages/en.php | 10 +++++++++- mod/file/start.php | 8 ++++++-- mod/pages/languages/en.php | 10 +++++++++- mod/pages/start.php | 13 +++++++++---- 8 files changed, 70 insertions(+), 34 deletions(-) diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php index 42606bf8e..e1930b916 100644 --- a/mod/blog/languages/en.php +++ b/mod/blog/languages/en.php @@ -58,7 +58,16 @@ $english = array( // notifications 'blog:newpost' => 'A new blog post', - 'blog:via' => "published a blog post", + 'blog:notification' => +' +%s made a new blog post. + +%s +%s + +View and comment on the new blog post: +%s +', // widget 'blog:widget:description' => 'Display your latest blog posts', diff --git a/mod/blog/start.php b/mod/blog/start.php index eb4e11086..73056f1c9 100644 --- a/mod/blog/start.php +++ b/mod/blog/start.php @@ -240,16 +240,15 @@ function blog_notify_message($hook, $type, $message, $params) { $to_entity = $params['to_entity']; $method = $params['method']; if (elgg_instanceof($entity, 'object', 'blog')) { - $descr = $entity->description; + $descr = $entity->excerpt; $title = $entity->title; - if ($method == 'email') { - $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo('blog:via') . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); - } - if ($method == 'web') { - $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo('blog:via') . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); - } + $owner = $entity->getOwnerEntity(); + return elgg_echo('blog:notification', array( + $owner->name, + $title, + $descr, + $entity->getURL() + )); } return null; } diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php index 2c589c207..d4980280d 100644 --- a/mod/bookmarks/languages/en.php +++ b/mod/bookmarks/languages/en.php @@ -23,10 +23,19 @@ $english = array( 'bookmarks:more' => "More", 'bookmarks:with' => "Share with", 'bookmarks:new' => "A new bookmark", - 'bookmarks:via' => "via bookmarks", 'bookmarks:address' => "Address of the bookmark", 'bookmarks:none' => 'No bookmarks', + 'bookmarks:notification' => +'%s added a new bookmark: + +%s - %s +%s + +View and comment on the new bookmark: +%s +', + 'bookmarks:delete:confirm' => "Are you sure you want to delete this resource?", 'bookmarks:numbertodisplay' => 'Number of bookmarks to display', diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php index 21a2d8940..56bac984a 100644 --- a/mod/bookmarks/start.php +++ b/mod/bookmarks/start.php @@ -245,21 +245,15 @@ function bookmarks_notify_message($hook, $entity_type, $returnvalue, $params) { if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'bookmarks')) { $descr = $entity->description; $title = $entity->title; - global $CONFIG; - $url = elgg_get_site_url() . "view/" . $entity->guid; - if ($method == 'sms') { - $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo("bookmarks:via") . ': ' . $url . ' (' . $title . ')'; - } - if ($method == 'email') { - $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo("bookmarks:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); - } - if ($method == 'web') { - $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo("bookmarks:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); - } - + $owner = $entity->getOwnerEntity(); + + return elgg_echo('bookmarks:notification', array( + $owner->name, + $title, + $entity->address, + $descr, + $entity->getURL() + )); } return null; } diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php index 278076927..b3344cb43 100644 --- a/mod/file/languages/en.php +++ b/mod/file/languages/en.php @@ -22,7 +22,6 @@ $english = array( 'file:gallery_list' => "Gallery or list view", 'file:num_files' => "Number of files to display", 'file:user:gallery'=>'View %s gallery', - 'file:via' => 'via files', 'file:upload' => "Upload a file", 'file:replace' => 'Replace file content (leave blank to not change file)', 'file:list:title' => "%s's %s %s", @@ -79,6 +78,15 @@ $english = array( 'item:object:file' => 'Files', 'file:newupload' => 'A new file has been uploaded', + 'file:notification' => +'%s uploaded a new file: + +%s +%s + +View and comment on the new file: +%s +', /** * Embed media diff --git a/mod/file/start.php b/mod/file/start.php index f8b512318..120129276 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -200,9 +200,13 @@ function file_notify_message($hook, $entity_type, $returnvalue, $params) { if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'file')) { $descr = $entity->description; $title = $entity->title; - $url = elgg_get_site_url() . "view/" . $entity->guid; $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $entity->title . "\n\n" . $descr . "\n\n" . $entity->getURL(); + return elgg_echo('file:notification', array( + $owner->name, + $title, + $descr, + $entity->getURL() + )); } return null; } diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php index 3620e7e8e..eb9d22708 100644 --- a/mod/pages/languages/en.php +++ b/mod/pages/languages/en.php @@ -28,7 +28,15 @@ $english = array( 'pages:navigation' => "Navigation", 'pages:new' => "A new page", - 'pages:via' => "via pages", + 'pages:notification' => +'%s added a new page: + +%s +%s + +View and comment on the new page: +%s +', 'item:object:page_top' => 'Top-level pages', 'item:object:page' => 'Pages', 'pages:nogroup' => 'This group does not have any pages yet', diff --git a/mod/pages/start.php b/mod/pages/start.php index b2f26c719..4b230a93d 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -264,13 +264,18 @@ function page_notify_message($hook, $entity_type, $returnvalue, $params) { $entity = $params['entity']; $to_entity = $params['to_entity']; $method = $params['method']; - if (($entity instanceof ElggEntity) && (($entity->getSubtype() == 'page_top') || ($entity->getSubtype() == 'page'))) { + + if (elgg_instanceof($entity, 'object', 'page') || elgg_instanceof($entity, 'object', 'page_top')) { $descr = $entity->description; $title = $entity->title; - //@todo why? - $url = elgg_get_site_url() . "view/" . $entity->guid; $owner = $entity->getOwnerEntity(); - return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); + + return elgg_echo('pages:notification', array( + $owner->name, + $title, + $descr, + $entity->getURL() + )); } return null; } -- cgit v1.2.3