From 7325d9435831b43c91af6eb3d13b259c02b2a439 Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 20 Jun 2008 13:54:14 +0000
Subject: Widget gallery updates - internationalised and more

git-svn-id: https://code.elgg.org/elgg/trunk@1025 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 languages/en.php                         | 4 ++++
 mod/profile/edit.php                     | 4 +++-
 views/default/canvas/layouts/widgets.php | 9 +++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index e07fa5d48..f92755fe1 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -305,6 +305,10 @@
 	
 			'widgets' => "Widgets",
 			'widget' => "Widget",
+			'layout:customise' => "Customise layout",
+			'widgets:gallery' => "Widget gallery",
+			'widgets:maincontent' => "Main content area widgets",
+			'widgets:sidebar' => "Sidebar widgets",
 			'widgets:panel:save:success' => "Your widgets were successfully saved.",
 			'widgets:panel:save:failure' => "There was a problem saving your widgets. Please try again.",
 			'widgets:save:success' => "The widget was successfully saved.",
diff --git a/mod/profile/edit.php b/mod/profile/edit.php
index 9db4848dd..50f4b0955 100644
--- a/mod/profile/edit.php
+++ b/mod/profile/edit.php
@@ -17,7 +17,9 @@
 		if (!isloggedin()) forward();
 		
 	// Get current user for now
-		$user = $_SESSION['user'];
+		if (!$user = page_owner_entity()) {
+			$user = $_SESSION['user'];
+		}
 		
 	// Get form, if we're allowed to edit
 		if ($user->canEdit()) {
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 3ceb7305a..3c033aee5 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -26,7 +26,7 @@
 <div id="customise_editpanel">
 
 <div id="widget_picker_gallery">
-<h2>Widget gallery</h2>
+<h2><?php echo elgg_echo("widgets:gallery"); ?></h2>
 
 <?php
 
@@ -61,7 +61,7 @@
 <td width="300px">
 
 <div id="main_widgets">
-<h2>Main content area widgets</h2>
+<h2><?php echo elgg_echo("widgets:maincontent"); ?></h2>
 <?php
 	$mainwidgetstring = "";
 	if (is_array($area1widgets) && sizeof($area1widgets) > 0) {
@@ -97,7 +97,7 @@
 
 <td width="240px">
 <div id="rightsidebar_widgets">
-<h2>Right sidebar widgets</h2>
+<h2><?php echo elgg_echo("widgets:sidebar"); ?></h2>
 
 <?php
 	$sidebarwidgetstring = "";
@@ -149,7 +149,8 @@
 </div><!-- /customise_editpanel -->
 
 <!-- temporary customise button here -->
-<a href="javascript:void(0);" class="toggle_customise_edit_panel">Customise Layout</a>
+<a href="javascript:void(0);" class="toggle_customise_edit_panel"><?php echo elgg_echo("layout:customise"); ?></a>
+<br />
 
 <?php
 			
-- 
cgit v1.2.3