From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 23 Mar 2010 18:30:52 +0000 (+0000)
Subject: Minor update to profile language strings, and corrected view on riverdashboard for... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c71f11c1b7a4a2ee634acd50582e5202da5389cc;p=lorea%2Felgg.git

Minor update to profile language strings, and corrected view on riverdashboard for views to extend.

git-svn-id: http://code.elgg.org/elgg/trunk@5484 36083f99-b078-4883-b0ff-0f9b5a30f544
---

diff --git a/mod/profile/languages/en.php b/mod/profile/languages/en.php
index 67420836b..ee1c20115 100644
--- a/mod/profile/languages/en.php
+++ b/mod/profile/languages/en.php
@@ -69,7 +69,7 @@ $english = array(
 	'profile:defaultprofile:reset' => 'Default system profile reset',
 
 	'profile:resetdefault' => 'Reset default profile',
-	'profile:explainchangefields' => 'You can replace the existing profile fields with your own using the form below. First you give the new profile field a label, for example, \'Favourite team\'. Next you need to select the field type, for example, tags, url, text and so on. At any time you can revert back to the default profile set up.',
+	'profile:explainchangefields' => 'You can replace the existing profile fields with your own using the form below. First you give the new profile field a label, for example, \'Favorite team\'. Next you need to select the field type, for example, tags, url, text and so on. At any time you can revert back to the default profile set up.',
 
 
 /**
diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index b51672c95..9fc54dda6 100644
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -48,7 +48,7 @@ $river = str_replace('callback=true','replaced=88,334',$river);
 $nav = elgg_view('riverdashboard/nav',array('type' => $type,'subtype' => $subtype,'orient' => $orient));
 if(isloggedin()){
 	$sidebar = elgg_view("riverdashboard/menu",array('type' => $type,'subtype' => $subtype,'orient' => $orient));
-	$sidebar .= elgg_view("riverdashboard/sidebar_options", array("object_type" => 'riverdashboard'));
+	$sidebar .= elgg_view("riverdashboard/sidebar", array("object_type" => 'riverdashboard'));
 }else{
 	$sidebar = '';
 }