diff options
Diffstat (limited to 'views')
-rw-r--r-- | views/default/admin/plugins/simple.php | 4 | ||||
-rw-r--r-- | views/default/annotation/annotate.php | 2 | ||||
-rw-r--r-- | views/default/friends/river/create.php | 2 | ||||
-rw-r--r-- | views/default/group/search/startblurb.php | 2 | ||||
-rw-r--r-- | views/default/object/default.php | 8 | ||||
-rw-r--r-- | views/default/user/search/startblurb.php | 4 |
6 files changed, 10 insertions, 12 deletions
diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php index 017c6e7fe..9b9897944 100644 --- a/views/default/admin/plugins/simple.php +++ b/views/default/admin/plugins/simple.php @@ -45,11 +45,11 @@ foreach ($plugin_list as $name => $info) { $author = $link = $version = $settings = ''; if (isset($manifest['author'])) { - $author = sprintf(elgg_echo('admin:plugins:author'), $manifest['author']); + $author = elgg_echo('admin:plugins:author', array($manifest['author'])); } if (isset($manifest['version'])) { - $version = ' | ' . sprintf(elgg_echo('admin:plugins:version'), $manifest['version']); + $version = ' | ' . elgg_echo('admin:plugins:version', array($manifest['version'])); } if (isset($manifest['website'])) { diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php index 3266b2904..6e83e8afb 100644 --- a/views/default/annotation/annotate.php +++ b/views/default/annotation/annotate.php @@ -16,7 +16,7 @@ if ($vars['item']->annotation_id != 0) { } $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; -$string = sprintf(elgg_echo("river:posted:generic"), $url) . " "; +$string = elgg_echo("river:posted:generic", array($url)) . " "; $string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created) . "<a class='river_comment_form_button link'>Comment</a>"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= "</span>"; diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php index b0319beb5..cd84c5289 100644 --- a/views/default/friends/river/create.php +++ b/views/default/friends/river/create.php @@ -10,7 +10,7 @@ $performed_by = get_entity($vars['item']->subject_guid); $performed_on = get_entity($vars['item']->object_guid); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; -$string = sprintf(elgg_echo("friends:river:add"),$url) . " "; +$string = elgg_echo("friends:river:add", array($url) . " "; $string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a>"; $string .= "<div class=\"river_content_display\">"; $string .= "<table><tr><td>" . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'tiny')) . "</td>"; diff --git a/views/default/group/search/startblurb.php b/views/default/group/search/startblurb.php index 3a5809193..92256d1db 100644 --- a/views/default/group/search/startblurb.php +++ b/views/default/group/search/startblurb.php @@ -9,6 +9,6 @@ elgg_deprecated_notice('view groups/search/startblurb was deprecated.', 1.7); <div class="contentWrapper"> <?php - echo sprintf(elgg_echo("group:search:startblurb"),$vars['tag']); + echo elgg_echo("group:search:startblurb", array($vars['tag'])); ?> </div> diff --git a/views/default/object/default.php b/views/default/object/default.php index 0f07996b2..040bae832 100644 --- a/views/default/object/default.php +++ b/views/default/object/default.php @@ -29,7 +29,7 @@ if ($vars['full']) { $controls = ""; if ($vars['entity']->canEdit()) { $delete = elgg_view('output/confirm_link', array( - 'href' => "action/entities/delete?guid={$vars['entity']->guid}", + 'href' => "action/entities/delete?guid={$vars['entity']->guid}", 'text' => elgg_echo('delete') )); $controls .= " ($delete)"; @@ -44,13 +44,13 @@ if ($vars['full']) { $owner = $vars['entity']->getOwnerEntity(); $ownertxt = elgg_echo('unknown'); if ($owner) { - $ownertxt = "<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"; + $ownertxt = "<a href=\"" . $owner->getURL() . "\">" . $owner->name . "</a>"; } - $info .= "<div>".sprintf(elgg_echo("entity:default:strapline"), + $info .= "<div>" . elgg_echo("entity:default:strapline", array( elgg_view_friendly_time($vars['entity']->time_created), $ownertxt - ); + )); $info .= "</div>"; diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php index a4ee421a1..806157609 100644 --- a/views/default/user/search/startblurb.php +++ b/views/default/user/search/startblurb.php @@ -7,6 +7,4 @@ elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7); -echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']); - -?> +echo elgg_echo("user:search:startblurb", array($vars['tag']));
\ No newline at end of file |