MDL-13103 merging from 1.9

This commit is contained in:
nicolasconnault 2008-01-25 13:00:45 +00:00
parent 4c546b8149
commit 1bf7621ca4
3 changed files with 45 additions and 0 deletions

View File

@ -926,6 +926,7 @@ $string['missingcountry'] = 'Missing country';
$string['missingdescription'] = 'Missing description';
$string['missingemail'] = 'Missing email address';
$string['missingfirstname'] = 'Missing given name';
$string['missingfromdisk'] = 'Missing from disk';
$string['missingfullname'] = 'Missing full name';
$string['missinglastname'] = 'Missing surname';
$string['missingname'] = 'Missing name';

View File

@ -7826,5 +7826,44 @@ function object_array_unique($array, $keep_key_assoc = true) {
return $keep_key_assoc ? $array : array_values($array);
}
/**
* Returns the language string for the given plugin.
*
* @param string $plugin the plugin code name
* @param string $type the type of plugin (mod, block, filter)
* @return string The plugin language string
*/
function get_plugin_name($plugin, $type='mod') {
$plugin_name = '';
switch ($type) {
case 'mod':
$plugin_name = get_string('modulename', $plugin);
break;
case 'blocks':
$plugin_name = get_string('blockname', "block_$plugin");
if (empty($plugin_name) || $plugin_name == '[[blockname]]') {
if (($block = block_instance($plugin)) !== false) {
$plugin_name = $block->get_title();
} else {
$plugin_name = "[[$plugin]]";
}
}
break;
case 'filter':
$plugin_name = trim(get_string('filtername', $plugin));
if (empty($plugin_name) or ($plugin_name == '[[filtername]]')) {
$textlib = textlib_get_instance();
$plugin_name = $textlib->strtotitle($plugin);
}
break;
default:
$plugin_name = $plugin;
break;
}
return $plugin_name;
}
// vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
?>

View File

@ -327,6 +327,11 @@ table.flexible .r1 {
font-weight: bold;
}
.plugincompattable td.missingplugin {
color: #FF7500;
font-weight: bold;
}
/* Admin settings */
#adminsettings fieldset {