From bc21e6778ffd5b4b4f2828fd720dc6590870f46f Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 17 Dec 2010 01:22:00 +0000 Subject: updated the river generic_comment view for the new river code git-svn-id: http://code.elgg.org/elgg/trunk@7650 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/languages/en.php | 1 + mod/file/languages/en.php | 2 +- mod/pages/languages/en.php | 5 ++--- mod/pages/views/default/river/object/page/annotate.php | 17 ----------------- .../views/default/river/object/page_top/annotate.php | 16 ---------------- 5 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 mod/pages/views/default/river/object/page/annotate.php delete mode 100644 mod/pages/views/default/river/object/page_top/annotate.php (limited to 'mod') diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php index f3d93f5e3..39e1a7ad0 100644 --- a/mod/blog/languages/en.php +++ b/mod/blog/languages/en.php @@ -53,6 +53,7 @@ $english = array( // river 'blog:river:create' => 'published a blog post', + 'river:commented:object:blog' => 'the blog', ); add_translation('en', $english); diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php index 9e661c276..dd317b5c7 100644 --- a/mod/file/languages/en.php +++ b/mod/file/languages/en.php @@ -71,7 +71,7 @@ 'file:river:created' => "%s uploaded", 'file:river:item' => "a file", - 'file:river:annotate' => "a comment on this file", + 'river:commented:object:file' => 'the file', 'item:object:file' => 'Files', diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php index 1c20a4297..1fc5929b2 100644 --- a/mod/pages/languages/en.php +++ b/mod/pages/languages/en.php @@ -38,14 +38,13 @@ $english = array( * River **/ - 'pages:river:annotate' => "a comment on this page", 'pages:river:created' => "%s wrote", 'pages:river:updated' => "%s updated", 'pages:river:posted' => "%s posted", 'pages:river:create' => "a new page titled", 'pages:river:update' => "a page titled", - 'page:river:annotate' => "a comment on this page", - 'page_top:river:annotate' => "a comment on this page", + 'river:commented:object:page' => 'the page', + 'river:commented:object:page_top' => 'the page', /** * Form fields diff --git a/mod/pages/views/default/river/object/page/annotate.php b/mod/pages/views/default/river/object/page/annotate.php deleted file mode 100644 index 811fc7dea..000000000 --- a/mod/pages/views/default/river/object/page/annotate.php +++ /dev/null @@ -1,17 +0,0 @@ -getSubject(); -$object = $statement->getObject(); - -$url = "getURL()}\">{$performed_by->name}"; -$string = elgg_echo("pages:river:posted", array($url)) . " "; -$string .= "getURL() . "\">" . elgg_echo("pages:river:annotate:create") . " " . $object->title; -//$string .= "
" . $object->title . "
"; - -echo $string; diff --git a/mod/pages/views/default/river/object/page_top/annotate.php b/mod/pages/views/default/river/object/page_top/annotate.php deleted file mode 100644 index e12eb55f9..000000000 --- a/mod/pages/views/default/river/object/page_top/annotate.php +++ /dev/null @@ -1,16 +0,0 @@ -getSubject(); -$object = $statement->getObject(); - -$url = "getURL()}\">{$performed_by->name}"; -$string = elgg_echo("pages:river:posted", array($url)) . " "; -$string .= elgg_echo("pages:river:annotate:create") . " getURL() . "\">" . $object->title . ""; - -echo $string; -- cgit v1.2.3