diff options
| -rw-r--r-- | mod/ecml/languages/en.php | 24 | ||||
| -rw-r--r-- | mod/ecml/start.php | 6 |
2 files changed, 10 insertions, 20 deletions
diff --git a/mod/ecml/languages/en.php b/mod/ecml/languages/en.php index 11db26a62..dfe6b3f50 100644 --- a/mod/ecml/languages/en.php +++ b/mod/ecml/languages/en.php @@ -13,29 +13,21 @@ $english = array( 'ecml' => 'ECML', 'ecml:help' => 'ECML Help', - // views 'ecml:views:annotation_generic_comment' => 'Comments', // keywords - 'ecml:keywords:desc:entity' => 'Displays a list of any Elgg entity.', - 'ecml:keywords:usage:entity' => '[entity] supports all options in elgg_get_entities()', - - 'ecml:keywords:desc:view' => 'Displays any Elgg view.', - 'ecml:keywords:usage:view' => '[view src="valid/view" arg1=value1 arg2=value2]', - - 'ecml:keywords:desc:googlemaps' => 'Embed a Google Map.', - 'ecml:keywords:usage:entity' => '[googlemaps src="URL"] Use the link code from Google Maps as the src.', - - 'ecml:keywords:desc:slideshare' => 'Embed a Slideshare slide.', - 'ecml:keywords:usage:entity' => '[slideshare id="slideshare_id"] Use the Wordpress.com embed code.', + 'ecml:keywords:googlemaps:desc' => 'Embed a Google Map.', + 'ecml:keywords:googlemaps:usage' => '[googlemaps src="URL"] Use the link code from Google Maps as the src.', - 'ecml:keywords:desc:vimeo' => 'Embed a Vimeo video.', - 'ecml:keywords:usage:videmo' => '[videmo src="URL"] Use a standard Vimeo URL as the source.', + 'ecml:keywords:slideshare:desc' => 'Embed a Slideshare slide.', + 'ecml:keywords:slideshare:usage' => '[slideshare id="slideshare_id"] Use the Wordpress.com embed code.', - 'ecml:keywords:desc:youtube' => 'Embed a YouTube video.', - 'ecml:keywords:usage:entity' => '[youtube src="URL"] Use a standard YouTube URL as the source.', + 'ecml:keywords:vimeo:desc' => 'Embed a Vimeo video.', + 'ecml:keywords:videmo:usage' => '[videmo src="URL"] Use a standard Vimeo URL as the source.', + 'ecml:keywords:youtube:desc' => 'Embed a YouTube video.', + 'ecml:keywords:youtube:usage' => '[youtube src="URL"] Use a standard YouTube URL as the source.', // keyword help 'ecml:keywords_title' => 'Keywords', diff --git a/mod/ecml/start.php b/mod/ecml/start.php index f48aa2d25..4ea50766e 100644 --- a/mod/ecml/start.php +++ b/mod/ecml/start.php @@ -141,8 +141,6 @@ function ecml_keyword_hook($hook, $type, $value, $params) { // I keep going back and forth about entity and view. They're powerful, but // a great way to let a site get hacked if the admin doesn't lock them down. $keywords = array( - 'entity', - 'view', 'youtube', 'slideshare', 'vimeo', @@ -157,8 +155,8 @@ function ecml_keyword_hook($hook, $type, $value, $params) { foreach ($keywords as $keyword) { $value[$keyword] = array( 'view' => "ecml/keywords/$keyword", - 'description' => elgg_echo("ecml:keywords:desc:$keyword"), - 'usage' => elgg_echo("ecml:keywords:usage:$keyword") + 'description' => elgg_echo("ecml:keywords:$keyword:desc"), + 'usage' => elgg_echo("ecml:keywords:$keyword:usage") ); } |