Refs #2871 advanced plugin filtering works - sorting still does odd things

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

diff --git a/languages/en.php b/languages/en.php
index e088d16376e6cdb3c782e35a377eff50cd621061..f827c6d51c2fea860ad02ae6440155dd5c9dfe54 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -564,6 +564,14 @@ $english = array(
        'admin:footer:community_forums' => 'Elgg Community Forums',
        'admin:footer:blog' => 'Elgg Blog',
 
+       'admin:plugins:category:all' => 'All plugins',
+       'admin:plugins:category:admin' => 'Admin',
+       'admin:plugins:category:bundled' => 'Bundled',
+       'admin:plugins:category:content' => 'Content',
+       'admin:plugins:category:development' => 'Development',
+       'admin:plugins:category:extension' => 'Extensions',
+       'admin:plugins:category:service' => 'Service/API',
+
 
 /**
  * Plugins

diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index ce465113fd5af573af223af21ad94b41fabcdd98..39919f9c7d053d929896a1e4aebb4985778ea345 100644 (file)
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -17,7 +17,7 @@ $show_category = get_input('category', null);
 // @todo this could be cached somewhere after have the manifest loaded
 $categories = array();
 
-foreach ($installed_plugins as $plugin) {
+foreach ($installed_plugins as $id => $plugin) {
        if (!$plugin->isValid()) {
                continue;
        }
@@ -33,13 +33,13 @@ foreach ($installed_plugins as $plugin) {
        if (isset($plugin_categories)) {
                foreach ($plugin_categories as $category) {
                        if (!array_key_exists($category, $categories)) {
-                               $categories[$category] = elgg_echo("admin:plugins:label:moreinfo:categories:$category");
+                               $categories[$category] = elgg_echo("admin:plugins:category:$category");
                        }
                }
        }
 }
 
-$categories = array_merge(array('' => elgg_echo('admin:plugins:categories:all')), $categories);
+$categories = array_merge(array('' => elgg_echo('admin:plugins:category:all')), $categories);
 
 $category_dropdown = elgg_view('input/dropdown', array(
        'name' => 'category',