aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-19 16:58:46 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-19 16:58:46 +0000
commit8a4261fb21d1fe604d00a6ad62848683fc575824 (patch)
treefc3ea2fc1556967626285a5aede798d1e63ac581
parente0f9cf7439891b0bb08164baba08b64cbabe2006 (diff)
downloadelgg-8a4261fb21d1fe604d00a6ad62848683fc575824.tar.gz
elgg-8a4261fb21d1fe604d00a6ad62848683fc575824.tar.bz2
Fixes #2824 moved byline text in core language file
git-svn-id: http://code.elgg.org/elgg/trunk@8334 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--languages/en.php1
-rw-r--r--mod/blog/languages/en.php2
-rw-r--r--mod/blog/lib/blog.php8
-rw-r--r--mod/blog/views/default/object/blog.php2
-rw-r--r--mod/bookmarks/views/default/object/bookmarks.php2
-rw-r--r--mod/file/views/default/object/file.php2
-rw-r--r--mod/thewire/views/default/object/thewire.php2
7 files changed, 9 insertions, 10 deletions
diff --git a/languages/en.php b/languages/en.php
index 6232c97d9..b5b994a1b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1025,6 +1025,7 @@ You cannot reply to this email.",
/**
* Entities
*/
+ 'byline' => 'By %s',
'entity:default:strapline' => 'Created %s by %s',
'entity:default:missingsupport:popup' => 'This entity cannot be displayed correctly. This may be because it requires support provided by a plugin that is no longer installed.',
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index 1fe34215e..b5a9f070d 100644
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -7,11 +7,9 @@
$english = array(
'blog' => 'Blogs',
'blog:blogs' => 'Blogs',
- 'blog:owned_blogs' => '%s',
'blog:revisions' => 'Revisions',
'blog:archives' => 'Archives',
'blog:blog' => 'Blog',
- 'blog:author_by_line' => 'By %s',
'item:object:blog' => 'Blogs',
'blog:title:user_blogs' => '%s\'s Blogs',
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 7fa1b9c5b..aa9241d23 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -31,7 +31,7 @@ function blog_get_page_content_read($guid = NULL) {
$return['title'] = htmlspecialchars($blog->title);
$container = $blog->getContainerEntity();
- $crumbs_title = elgg_echo('blog:owned_blogs', array($container->name));
+ $crumbs_title = $container->name;
if (elgg_instanceof($container, 'group')) {
elgg_push_breadcrumb($crumbs_title, "pg/blog/group/$container->guid/owner");
} else {
@@ -77,7 +77,7 @@ function blog_get_page_content_list($container_guid = NULL) {
$return['title'] = elgg_echo('blog:title:user_blogs', array($container->name));
elgg_set_page_owner_guid($container_guid);
- $crumbs_title = elgg_echo('blog:owned_blogs', array($container->name));
+ $crumbs_title = $container->name;
elgg_push_breadcrumb($crumbs_title);
if ($container_guid == $loggedin_userid) {
@@ -141,7 +141,7 @@ function blog_get_page_content_friends($user_guid) {
$return['filter_context'] = 'friends';
$return['title'] = elgg_echo('blog:title:friends');
- $crumbs_title = elgg_echo('blog:owned_blogs', array($user->name));
+ $crumbs_title = $user->name;
elgg_push_breadcrumb($crumbs_title, "pg/blog/owner/{$user->username}");
elgg_push_breadcrumb(elgg_echo('friends'));
@@ -197,7 +197,7 @@ function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
$user = get_user($owner_guid);
- $crumbs_title = elgg_echo('blog:owned_blogs', array($user->name));
+ $crumbs_title = $user->name;
elgg_push_breadcrumb($crumbs_title, "pg/blog/owner/{$user->username}");
elgg_push_breadcrumb(elgg_echo('blog:archives'));
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 61abf129f..a1d28ae1d 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -22,7 +22,7 @@ $owner_link = elgg_view('output/url', array(
'href' => "pg/blog/owner/$owner->username",
'text' => $owner->name,
));
-$author_text = elgg_echo('blog:author_by_line', array($owner_link));
+$author_text = elgg_echo('byline', array($owner_link));
$tags = elgg_view('output/tags', array('tags' => $blog->tags));
$date = elgg_view_friendly_time($blog->publish_date);
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 46c2466ed..3ac281e72 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -23,7 +23,7 @@ $owner_link = elgg_view('output/url', array(
'href' => "pg/file/owner/$owner->username",
'text' => $owner->name,
));
-$author_text = elgg_echo('blog:author_by_line', array($owner_link));
+$author_text = elgg_echo('byline', array($owner_link));
$tags = elgg_view('output/tags', array('tags' => $bookmark->tags));
$date = elgg_view_friendly_time($bookmark->time_created);
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index bbc138826..eb489581d 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -25,7 +25,7 @@ $owner_link = elgg_view('output/url', array(
'href' => "pg/file/owner/$owner->username",
'text' => $owner->name,
));
-$author_text = elgg_echo('blog:author_by_line', array($owner_link));
+$author_text = elgg_echo('byline', array($owner_link));
$file_icon = elgg_view_entity_icon($file, 'small');
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 6be137dff..49202d6e8 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -26,7 +26,7 @@ $owner_link = elgg_view('output/url', array(
'href' => "pg/thewire/owner/$owner->username",
'text' => $owner->name,
));
-$author_text = elgg_echo('blog:author_by_line', array($owner_link));
+$author_text = elgg_echo('byline', array($owner_link));
$date = elgg_view_friendly_time($post->time_created);
$metadata = elgg_view('thewire/metadata', array(