From ffca510fca9f902930dcbb1893bb6b5c5e1e8e3a Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 6 Jan 2011 01:56:30 +0000 Subject: switched from new to add git-svn-id: http://code.elgg.org/elgg/trunk@7846 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/languages/en.php | 2 +- mod/blog/lib/blog.php | 10 +++++----- mod/blog/start.php | 4 ++-- mod/blog/views/default/blog/group_module.php | 2 +- mod/file/index.php | 4 ++-- mod/file/languages/en.php | 2 +- mod/file/start.php | 4 ++-- mod/file/upload.php | 2 +- mod/file/views/default/file/group_module.php | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'mod') diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php index 8d0ee7c44..1fe34215e 100644 --- a/mod/blog/languages/en.php +++ b/mod/blog/languages/en.php @@ -23,7 +23,7 @@ $english = array( 'blog:write' => 'Write a blog post', // Editing - 'blog:new' => 'New blog post', + 'blog:add' => 'New blog post', 'blog:edit' => 'Edit blog post', 'blog:excerpt' => 'Excerpt', 'blog:body' => 'Body', diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index c0b24f92e..3a8985026 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -91,10 +91,10 @@ function blog_get_page_content_list($container_guid = NULL) { if (elgg_instanceof($container, 'group')) { $return['filter'] = ''; if ($container->isMember(get_loggedin_user())) { - $url = "pg/blog/new/$container->guid"; + $url = "pg/blog/add/$container->guid"; $params = array( 'href' => $url, - 'text' => elgg_echo("blog:new"), + 'text' => elgg_echo("blog:add"), 'class' => 'elgg-action-button', ); $buttons = elgg_view('output/url', $params); @@ -327,10 +327,10 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) { } elgg_set_page_owner_guid($container->guid); - elgg_push_breadcrumb(elgg_echo('blog:new')); + elgg_push_breadcrumb(elgg_echo('blog:add')); $body_vars = blog_prepare_form_vars($blog); - $title = elgg_echo('blog:new'); + $title = elgg_echo('blog:add'); $content = elgg_view_form('blog/save', $vars, $body_vars); $content .= elgg_view('js/blog/save_draft'); } @@ -472,7 +472,7 @@ function blog_url_forwarder($page) { $url = "{$CONFIG->wwwroot}pg/blog/friends/{$page[0]}"; break; case "new": - $url = "{$CONFIG->wwwroot}pg/blog/new/$user->guid"; + $url = "{$CONFIG->wwwroot}pg/blog/add/$user->guid"; break; case "owner": $url = "{$CONFIG->wwwroot}pg/blog/owner/{$page[0]}"; diff --git a/mod/blog/start.php b/mod/blog/start.php index ea88c5a7b..afedfc4d7 100644 --- a/mod/blog/start.php +++ b/mod/blog/start.php @@ -85,7 +85,7 @@ function blog_runonce() { * Friends' blog: pg/blog/friends/ * User's archives: pg/blog/archives/// * Blog post: pg/blog/view// - * New post: pg/blog/new/<guid> + * New post: pg/blog/add/<guid> * Edit post: pg/blog/edit/<guid>/<revision> * Preview post: pg/blog/preview/<guid> * Group blog: pg/blog/group/<guid>/owner @@ -129,7 +129,7 @@ function blog_page_handler($page) { case 'view': $params = blog_get_page_content_read($page[1]); break; - case 'new': + case 'add': gatekeeper(); $params = blog_get_page_content_edit($page_type, $page[1]); break; diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php index 57adff678..a88f223db 100644 --- a/mod/blog/views/default/blog/group_module.php +++ b/mod/blog/views/default/blog/group_module.php @@ -35,7 +35,7 @@ if (!$content) { } $new_link = elgg_view('output/url', array( - 'href' => "pg/blog/new/$group->guid", + 'href' => "pg/blog/add/$group->guid", 'text' => elgg_echo('blog:write'), )); $content .= "<span class='elgg-widget-more'>$new_link</span>"; diff --git a/mod/file/index.php b/mod/file/index.php index 940f9c30f..8f2546ca0 100644 --- a/mod/file/index.php +++ b/mod/file/index.php @@ -32,10 +32,10 @@ if ($owner->guid == get_loggedin_userid()) { $title = elgg_echo("file:user", array($owner->name)); $params['filter'] = ''; if ($owner->isMember(get_loggedin_user())) { - $url = "pg/file/new/$owner->guid"; + $url = "pg/file/add/$owner->guid"; $vars = array( 'href' => $url, - 'text' => elgg_echo("file:new"), + 'text' => elgg_echo("file:add"), 'class' => 'elgg-action-button', ); $button = elgg_view('output/url', $vars); diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php index 14de64ed5..52113a3e2 100644 --- a/mod/file/languages/en.php +++ b/mod/file/languages/en.php @@ -31,7 +31,7 @@ $english = array( 'file:list:title' => "%s's %s %s", 'file:title:friends' => "Friends'", - 'file:new' => 'Upload a file', + 'file:add' => 'Upload a file', 'file:file' => "File", 'file:title' => "Title", diff --git a/mod/file/start.php b/mod/file/start.php index 46503b3a7..88213fc5c 100644 --- a/mod/file/start.php +++ b/mod/file/start.php @@ -70,7 +70,7 @@ function file_init() { * User's files: pg/file/owner/<username> * Friends' files: pg/file/friends/<username> * View file: pg/file/view/<guid>/<title> - * New file: pg/file/new/<guid> + * New file: pg/file/add/<guid> * Edit file: pg/file/edit/<guid> * Group files: pg/file/group/<guid>/owner * @@ -102,7 +102,7 @@ function file_page_handler($page) { set_input('guid', $page[1]); include "$file_dir/view.php"; break; - case 'new': + case 'add': set_input('guid', $page[1]); include "$file_dir/upload.php"; break; diff --git a/mod/file/upload.php b/mod/file/upload.php index f5fab81f4..8f10b9d82 100644 --- a/mod/file/upload.php +++ b/mod/file/upload.php @@ -13,7 +13,7 @@ $owner = elgg_get_page_owner(); gatekeeper(); group_gatekeeper(); -$title = elgg_echo('file:new'); +$title = elgg_echo('file:add'); // set up breadcrumbs elgg_push_breadcrumb(elgg_echo('file'), "pg/file/all/"); diff --git a/mod/file/views/default/file/group_module.php b/mod/file/views/default/file/group_module.php index babdcf677..e0501709f 100644 --- a/mod/file/views/default/file/group_module.php +++ b/mod/file/views/default/file/group_module.php @@ -35,8 +35,8 @@ if (!$content) { } $new_link = elgg_view('output/url', array( - 'href' => "pg/file/new/$group->guid", - 'text' => elgg_echo('file:new'), + 'href' => "pg/file/add/$group->guid", + 'text' => elgg_echo('file:add'), )); $content .= "<span class='elgg-widget-more'>$new_link</span>"; -- cgit v1.2.3