L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-63403 filter_glossary: Fix lang string concatenation

Browse Source
This commit is contained in:
Tim Hunt
2018-10-18 18:44:11 +02:00
committed by Eloy Lafuente (stronk7)
parent 8b73e0f6fe
commit 2e14a686ea
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filter/glossary/filter.php
+5 -6
View File
@@ -85,15 +85,13 @@ class filter_glossary extends moodle_text_filter {
return $this->cacheconceptlist;
}
$strcategory = get_string('category', 'glossary');
$conceptlist = array();
foreach ($allconcepts as $concepts) {
foreach ($concepts as $concept) {
if ($concept->category) { // Link to a category.
// TODO: Fix this string usage.
$title = $glossaries[$concept->glossaryid] . ': ' . $strcategory . ' ' . $concept->concept;
$title = get_string('glossarycategory', 'filter_glossary',
['glossary' => $glossaries[$concept->glossaryid], 'category' => $concept->concept]);
$link = new moodle_url('/mod/glossary/view.php', array('g' => $concept->glossaryid, 'mode' => 'cat', 'hook' => $concept->id));
$attributes = array(
'href' => $link,
@@ -102,7 +100,8 @@ class filter_glossary extends moodle_text_filter {
$conceptid = 0;
} else { // Link to entry or alias
$title = $glossaries[$concept->glossaryid] . ': ' . $concept->concept;
$title = get_string('glossaryconcept', 'filter_glossary',
['glossary' => $glossaries[$concept->glossaryid], 'concept' => $concept->concept]);
// Hardcoding dictionary format in the URL rather than defaulting
// to the current glossary format which may not work in a popup.
// for example "entry list" means the popup would only contain
@@ -122,7 +121,7 @@ class filter_glossary extends moodle_text_filter {
$href_tag_begin = html_writer::start_tag('a', $attributes);
$filterobj = new filterobject($concept->concept, $href_tag_begin, '</a>',
$concept->casesensitive, $concept->fullmatch);;
$concept->casesensitive, $concept->fullmatch);
$filterobj->conceptid = $conceptid;
$conceptlist[] = $filterobj;
}
filter/glossary/lang/en/filter_glossary.php
+2
View File
@@ -25,5 +25,7 @@
defined('MOODLE_INTERNAL') || die();
$string['glossarycategory'] = '{$a->glossary}: Category {$a->category}';
$string['glossaryconcept'] = '{$a->glossary}: {$a->concept}';
$string['filtername'] = 'Glossary auto-linking';
$string['privacy:metadata'] = 'The Glossary auto-linking plugin does not store any personal data.';