Fixes #2893: More visible invalid plugin errors

diff --git a/languages/en.php b/languages/en.php
index e9c333041bfd65a2dded76247cacaace4f1ada7c..294762f283a00e5fdf6cf7a5ed1231ad1ce90681 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -75,10 +75,10 @@ $english = array(
        'ElggPlugin:MissingID' => 'Missing plugin ID (guid %s)',
        'ElggPlugin:NoPluginPackagePackage' => 'Missing ElggPluginPackage for plugin ID %s (guid %s)',
 
-       'ElggPluginPackage:InvalidPlugin:MissingFile' => 'Missing file %s in package',
-       'ElggPluginPackage:InvalidPlugin:InvalidDependency' => 'Invalid dependency type "%s"',
-       'ElggPluginPackage:InvalidPlugin:InvalidProvides' => 'Invalid provides type "%s"',
-       'ElggPluginPackage:InvalidPlugin:CircularDep' => 'Invalid %s dependency "%s" in plugin %s.  Plugins cannot conflict with or require something they provide!',
+       'ElggPluginPackage:InvalidPlugin:MissingFile' => 'The required file "%s" is missing.',
+       'ElggPluginPackage:InvalidPlugin:InvalidDependency' => 'Its manifest contains an invalid dependency type "%s".',
+       'ElggPluginPackage:InvalidPlugin:InvalidProvides' => 'Its manifest contains an invalid provides type "%s".',
+       'ElggPluginPackage:InvalidPlugin:CircularDep' => 'There is an invalid %s dependency "%s" in plugin %s.  Plugins cannot conflict with or require something they provide!',
 
        'ElggPlugin:Exception:CannotIncludeFile' => 'Cannot include %s for plugin %s (guid: %s) at %s.',
        'ElggPlugin:Exception:CannotRegisterViews' => 'Cannot open views dir for plugin %s (guid: %s) at %s.',
@@ -697,7 +697,8 @@ $english = array(
 
        'admin:plugins:warning:elgg_version_unknown' => 'This plugin uses a legacy manifest file and does not specify a compatible Elgg version. It probably will not work!',
        'admin:plugins:warning:unmet_dependencies' => 'This plugin has unmet dependencies and cannot be activated. Check dependencies under more info.',
-       'admin:plugins:warning:invalid' => '%s is not a valid Elgg plugin.  Check <a href="http://docs.elgg.org/Invalid_Plugin">the Elgg documentation</a> for troubleshooting tips.',
+       'admin:plugins:warning:invalid' => 'This plugin is invalid: %s',
+       'admin:plugins:warning:invalid:check_docs' => 'Check <a href="http://docs.elgg.org/Invalid_Plugin">the Elgg documentation</a> for troubleshooting tips.',
        'admin:plugins:cannot_activate' => 'cannot activate',
 
        'admin:plugins:set_priority:yes' => "Reordered %s.",

diff --git a/views/default/object/plugin/invalid.php b/views/default/object/plugin/invalid.php
index f24e1836c52469a7caa40e65c678d97e54538c6f..828bceabab1c4477c3068c432ea72ed136c3ee00 100644 (file)
--- a/views/default/object/plugin/invalid.php
+++ b/views/default/object/plugin/invalid.php
@@ -14,8 +14,7 @@ $plugin = $vars['entity'];
 
 $id = $plugin->getID();
 $path = htmlspecialchars($plugin->getPath());
-$message = elgg_echo('admin:plugins:warning:invalid', array($id));
-$error = $plugin->getError();
+$message = elgg_echo('admin:plugins:warning:invalid', array($plugin->getError()));
 $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
 
 ?>
@@ -23,7 +22,8 @@ $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
 <div class="elgg-state-draggable elgg-plugin elgg-state-inactive elgg-state-error" id="elgg-plugin-<?php echo $plugin->guid; ?>">
        <div class="elgg-head"><h3><?php echo $id; ?></h3></div>
        <div class="elgg-body">
-               <p><?php echo $message; ?></p>
+               <p class="elgg-state-error"><?php echo $message; ?></p>
+               <p><?php echo elgg_echo('admin:plugins:warning:invalid:check_docs'); ?></p>
                
                <div class="pts">
                        <?php
@@ -37,7 +37,6 @@ $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
 
                <div class="hidden elgg-plugin-more" id="elgg-plugin-manifest-<?php echo $css_id; ?>">
                        <p><?php echo elgg_echo('admin:plugins:label:location') . ": " . $path; ?></p>
-                       <p><?php echo $error; ?></p>
                </div>
        </div>
 </div>
\ No newline at end of file