mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 17:02:03 +02:00
Code Issues Projects Releases Wiki Activity

MDL-22054 the last blockname removed

Browse Source
This commit is contained in:
Petr Skoda 2010-04-11 11:57:46 +00:00
parent 73d0160fd9
commit 150135ab08
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/glossary_random/edit_form.php
View File

@ -37,7 +37,7 @@ class block_glossary_random_edit_form extends block_edit_form {
$mform->addElement('header', 'configheader', get_string('blocksettings', 'block'));
$mform->addElement('text', 'config_title', get_string('title', 'block_glossary_random'));
$mform->setDefault('config_title', get_string('blockname','block_glossary_random'));
$mform->setDefault('config_title', get_string('pluginname','block_glossary_random'));
$mform->setType('config_title', PARAM_MULTILANG);
// Select glossaries to put in dropdown box ...

2
blocks/search/config_global.html
View File

@ -272,7 +272,7 @@ if ($blocks = $DB->get_records_select('block', "name $searchable_list", $params,
echo "<input type=\"checkbox\" name=\"search_in_{$block->name}\" value=\"1\" {$checked} />";
// multiple fallback strategy to get the name of the block
$blocklabel = get_string('blockname', 'block_'.$block->name);
$blocklabel = get_string('pluginname', 'block_'.$block->name);
if ($blocklabel == '[[blockname]]') $blocklabel = get_string($block->name, 'block_'.$block->name);
if ($blocklabel == "[[{$block->name}]]") $blocklabel = "<span class=\"dimmed_text\">$block->name</span>";
echo " - ".$blocklabel.'<br/>';

2
blocks/section_links/block_section_links.php
View File

@ -40,7 +40,7 @@ class block_section_links extends block_base {
} else if ($course->format == 'weeks') {
$this->title = get_string('weeks', 'block_section_links');
} else {
$this->title = get_string('blockname', 'block_section_links');
$this->title = get_string('pluginname', 'block_section_links');
}
}
}

2
lib/moodlelib.php
View File

@ -5905,7 +5905,7 @@ class amos_string_manager implements string_manager {
$string = $this->load_component_strings($component, $lang);
if (!isset($string[$identifier])) {
if ($identifier !== 'parentlanguage' and $identifier !== 'blockname' and strpos($component, 'format_') !== 0 and $component !== 'pix') {
if ($identifier !== 'parentlanguage' and strpos($component, 'format_') !== 0 and $component !== 'pix') {
debugging("Invalid get_string() identifier: '$identifier' or component '$component'", DEBUG_DEVELOPER);
}
return "[[$identifier]]";

2
search/stats.php
View File

@ -153,7 +153,7 @@ require_once($CFG->dirroot.'/search/lib.php');
if ($type->type == 'mod'){
$table->data[] = array(get_string('documentsfor', 'search') . " '".get_string('modulenameplural', $type->name)."'", $type->records);
} else if ($type->type == 'block') {
$table->data[] = array(get_string('documentsfor', 'search') . " '".get_string('blockname', $type->name)."'", $type->records);
$table->data[] = array(get_string('documentsfor', 'search') . " '".get_string('pluginname', $type->name)."'", $type->records);
} else {
$table->data[] = array(get_string('documentsfor', 'search') . " '".get_string($type->name)."'", $type->records);
}