diff options
| -rw-r--r-- | mod/river/languages/en.php | 4 | ||||
| -rw-r--r-- | mod/river/start.php | 4 | ||||
| -rw-r--r-- | mod/river/views/default/widgets/river_widget/view.php | 3 | ||||
| -rw-r--r-- | mod/river/views/default/widgets/river_widget_friends/view.php | 3 | ||||
| -rw-r--r-- | views/default/widgets/wrapper.php | 5 |
5 files changed, 8 insertions, 11 deletions
diff --git a/mod/river/languages/en.php b/mod/river/languages/en.php index 824164541..f6355837c 100644 --- a/mod/river/languages/en.php +++ b/mod/river/languages/en.php @@ -9,9 +9,9 @@ 'river:manifest:description' => "Provide a list of your or your friends recent activity!", 'river:widget:noactivity' => 'We could not find any activity.', - 'river:widget:title' => "%s activity.", + 'river:widget:title' => "Activity", 'river:widget:description' => "Show your latest activity.", - 'river:widget:title:friends' => "%s friends activity.", + 'river:widget:title:friends' => "Friends' activity", 'river:widget:description:friends' => "Show what your friends are up to.", 'river:widget:label:displaynum' => "Number of entries to display:", diff --git a/mod/river/start.php b/mod/river/start.php index e592aa1f1..5a7003e7b 100644 --- a/mod/river/start.php +++ b/mod/river/start.php @@ -17,8 +17,8 @@ { register_plugin_manifest_basic("Marcus Povey", elgg_echo('river:manifest:description'), "1.0", "http://www.elgg.org", "(C) Curverider 2008"); - add_widget_type('river_widget',sprintf(elgg_echo('river:widget:title'), 'Your'), elgg_echo('river:widget:description')); - add_widget_type('river_widget_friends',sprintf(elgg_echo('river:widget:title:friends'), 'Your'), elgg_echo('river:widget:description:friends')); + add_widget_type('river_widget',elgg_echo('river:widget:title'), elgg_echo('river:widget:description')); + add_widget_type('river_widget_friends',elgg_echo('river:widget:title:friends'), elgg_echo('river:widget:description:friends')); } register_elgg_event_handler('init','system','river_init'); diff --git a/mod/river/views/default/widgets/river_widget/view.php b/mod/river/views/default/widgets/river_widget/view.php index 27aeb7806..0e9d88a93 100644 --- a/mod/river/views/default/widgets/river_widget/view.php +++ b/mod/river/views/default/widgets/river_widget/view.php @@ -14,8 +14,5 @@ if ($vars['entity']->limit) $limit = $vars['entity']->limit; -?> -<h1><?php echo sprintf(elgg_echo('river:widget:title'), $owner->name . "'s") ?></h1> -<?php echo elgg_view_river($owner->guid, $limit); ?>
\ No newline at end of file diff --git a/mod/river/views/default/widgets/river_widget_friends/view.php b/mod/river/views/default/widgets/river_widget_friends/view.php index df96fcd76..ff6de8419 100644 --- a/mod/river/views/default/widgets/river_widget_friends/view.php +++ b/mod/river/views/default/widgets/river_widget_friends/view.php @@ -14,8 +14,5 @@ if ($vars['entity']->limit) $limit = $vars['entity']->limit; -?> -<h1><?php echo sprintf(elgg_echo('river:widget:title:friends'), $owner->name . "'s") ?></h1> -<?php echo elgg_view_friend_river($owner->guid, $limit); ?>
\ No newline at end of file diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php index bf77aea62..1c1d6a0dc 100644 --- a/views/default/widgets/wrapper.php +++ b/views/default/widgets/wrapper.php @@ -11,9 +11,12 @@ * @link http://elgg.org/
*/
+ static $widgettypes;
+ if (!isset($widgettypes)) $widgettypes = get_widget_types();
+
if ($vars['entity'] instanceof ElggObject && $vars['entity']->getSubtype() == 'widget') {
$handler = $vars['entity']->handler;
- $title = $vars['entity']->title;
+ $title = $widgettypes[$vars['entity']->handler]->name;
} else {
$handler = "error";
$title = elgg_echo("error");
|