Updated language strings for site page ecml

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

2 files changed, 29 insertions, 17 deletions

diff --git a/mod/sitepages/languages/en.php b/mod/sitepages/languages/en.php
index 754719483..4e009a4a5 100644
--- a/mod/sitepages/languages/en.php
+++ b/mod/sitepages/languages/en.php
@@ -52,9 +52,21 @@ $english = array(
 	/**
 	 * ECML
 	 */
-	'sitepages:ecml:keywords:loginbox' => 'A standard login box.  Useful for the logged out content area.',
-	'sitepages:ecml:keywords:sitestats' => 'This does not exist yet.',
-	'sitepages:ecml:keywords:userlist' => "Lists users.  Supports only_with_avatars=TRUE|FALSE, list_type=newest|online|random, limit",
+	'sitepages:ecml:keywords:loginbox:desc' => 'A standard login box.',
+	'sitepages:ecml:keywords:loginbox:usage' => '[loginbox] Useful for the logged out content area.',
+
+	'sitepages:ecml:keywords:sitestats:desc' => 'This does not exist yet.',
+	'sitepages:ecml:keywords:sitestats:usage' => 'This does not exist yet.',
+
+	'sitepages:ecml:keywords:userlist:desc' => "Lists users.",
+	'sitepages:ecml:keywords:userlist:usage' => "[userlist OPTIONS] Supports only_with_avatars=TRUE|FALSE, list_type=newest|online|random, limit",
+
+	'sitepages:ecml:keywords:entity:desc' => 'Displays a list of any Elgg entity.',
+	'sitepages:ecml:keywords:entity:usage' => '[entity] supports all options in elgg_get_entities()',
+
+	'sitepages:ecml:keywords:view:desc' => 'Displays any Elgg view.',
+	'sitepages:ecml:keywords:view:usage' => '[view src="valid/view" arg1=value1 arg2=value2]',
+
 	'sitepages:ecml:views:custom_frontpage' => "Custom Front Page",
 );
 
diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index e45abb2b6..afdff5635 100644
--- a/mod/sitepages/start.php
+++ b/mod/sitepages/start.php
@@ -167,34 +167,34 @@ function sitepages_page_handler($page) {
 function sitepages_ecml_keyword_hook($hook, $entity_type, $return_value, $params) {
 	$return_value['loginbox'] = array(
 		'view' => 'account/forms/login',
-		'description' => elgg_echo('sitepages:ecml:keywords:login_box'),
-		'usage' => elgg_echo('sitepages:ecml:keywords:login_box_usage'),
+		'description' => elgg_echo('sitepages:ecml:keywords:loginbox:desc'),
+		'usage' => elgg_echo('sitepages:ecml:keywords:loginbox:usage'),
 		'restricted' => array('sitepages/custom_frontpage')
 	);
 
 	$return_value['userlist'] = array(
 		'view' => 'sitepages/keywords/userlist',
-		'description' => elgg_echo('sitepages:ecml:keywords:userlist'),
-		'usage' => elgg_echo('sitepages:ecml:keywords:userlist_usage'),
+		'description' => elgg_echo('sitepages:ecml:keywords:userlist:desc'),
+		'usage' => elgg_echo('sitepages:ecml:keywords:userlist:usage'),
 		'restricted' => array('sitepages/custom_frontpage')
 	);
 
-	$return_value['sitestats'] = array(
-		'view' => 'sitepages/keywords/sitestats',
-		'description' => elgg_echo('sitepages:ecml:keywords:sitestats'),
-		'usage' => elgg_echo('sitepages:ecml:keywords:sitestats_usage'),
-		'restricted' => array('sitepages/custom_frontpage')
-	);
+//	$return_value['sitestats'] = array(
+//		'view' => 'sitepages/keywords/sitestats',
+//		'description' => elgg_echo('sitepages:ecml:keywords:sitestats:desc'),
+//		'usage' => elgg_echo('sitepages:ecml:keywords:sitestats:usage'),
+//		'restricted' => array('sitepages/custom_frontpage')
+//	);
 
 	$return_value['entity'] = array(
-		'description' => elgg_echo('sitepages:ecml:keywords:entity'),
-		'usage' => elgg_echo('sitepages:ecml:keywords:entity_usage'),
+		'description' => elgg_echo('sitepages:ecml:keywords:entity:desc'),
+		'usage' => elgg_echo('sitepages:ecml:keywords:entity:usage'),
 		'restricted' => array('sitepages/custom_frontpage')
 	);
 
 	$return_value['view'] = array(
-		'description' => elgg_echo('sitepages:ecml:keywords:view'),
-		'usage' => elgg_echo('sitepages:ecml:keywords:view_usage'),
+		'description' => elgg_echo('sitepages:ecml:keywords:view:desc'),
+		'usage' => elgg_echo('sitepages:ecml:keywords:view:usage'),
 		'restricted' => array('sitepages/custom_frontpage')
 	);