Merge "Bug 1584273: Improve disabled & broken plugin sentences"

htdocs/lang/en.utf8/admin.php

@@ -141,8 +141,7 @@ $string['pluginsfields'] = 'Plugins settings';
 
 $string['pluginadmin'] = 'Plugin administration';
 $string['pluginadmindescription'] = 'Install and configure plugins';
-$string['missingplugin'] = 'An installed plugin (%s) could not be found';
-$string['missingplugindisabled'] = 'An installed plugin (%s) could not be found and has been disabled';
+$string['missingplugindisabled1'] = 'The installed plugin "%s" could not be found and has been disabled';
 $string['installedpluginsmissing'] = 'The following plugins are installed but can no longer be found';
 $string['ensurepluginsexist'] = 'Please make sure all your installed plugins are available under %s and readable by the webserver.';
 

htdocs/lang/en.utf8/mahara.php

@@ -104,7 +104,7 @@ $string['plugindisableduser'] = 'The %s plugin has been disabled. Please check w
 $string['pluginnotenabled'] = 'Plugin is hidden. You must make the %s plugin visible first.';
 $string['pluginexplainaddremove'] = 'Plugins in Mahara are always installed and can be accessed if users know the URLs and would otherwise have access. Rather than enabling and disabling the functionality, plugins are hidden or made visible by clicking on the \'Hide\' or \'Show\' links beside the plugins below.';
 $string['pluginexplainartefactblocktypes'] = 'When hiding an \'artefact\' type plugin, Mahara also stops the display of the blocks related to it.';
-$string['pluginbrokenanddisabledtitle'] = 'A broken plugin (%s) was disabled.';
+$string['pluginbrokenanddisabledtitle1'] = 'The broken plugin "%s" was disabled.';
 $string['pluginbrokenanddisabled'] = 'A user attempted to load the %s plugin, but it could not be loaded.
 To prevent further errors, the plugin has been disabled.
 

htdocs/lib/mahara.php

@@ -1576,7 +1576,7 @@ function safe_require_plugin($plugintype, $pluginname, $filename='lib.php', $fun
             global $SESSION;
 
             set_field($plugintype . '_installed', 'active', 0, 'name', $pluginname);
-            $SESSION->add_error_msg(get_string('missingplugindisabled', 'admin', hsc("$plugintype:$pluginname")));
+            $SESSION->add_error_msg(get_string('missingplugindisabled1', 'admin', hsc("$plugintype:$pluginname")));
 
             // Reset the plugin cache.
             plugins_installed('', TRUE, TRUE);
@@ -1584,7 +1584,7 @@ function safe_require_plugin($plugintype, $pluginname, $filename='lib.php', $fun
             // Alert site admins that the plugin is broken so was disabled
             $message = new stdClass();
             $message->users = get_column('usr', 'id', 'admin', 1);
-            $message->subject = get_string('pluginbrokenanddisabledtitle', 'mahara', $pluginname);
+            $message->subject = get_string('pluginbrokenanddisabledtitle1', 'mahara', $pluginname);
             $message->message = get_string('pluginbrokenanddisabled', 'mahara', $pluginname, $e->getMessage());
 
             require_once('activity.php');