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

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 67420836b5a81e5f0725092fc3ac4a36eac6c803..ee1c20115c659c2667d8ceed3cd18340c304bb66 100644 (file)
--- 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 b51672c95d7c4864a1706430307ba241c35445f7..9fc54dda69e874acb41e61a974a7a70832e1e26a 100644 (file)
--- 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));\r
 if(isloggedin()){\r
        $sidebar = elgg_view("riverdashboard/menu",array('type' => $type,'subtype' => $subtype,'orient' => $orient));\r
-       $sidebar .= elgg_view("riverdashboard/sidebar_options", array("object_type" => 'riverdashboard'));\r
+       $sidebar .= elgg_view("riverdashboard/sidebar", array("object_type" => 'riverdashboard'));\r
 }else{\r
        $sidebar = '';\r
 }\r