Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'glossary_multilang_m21' of git://github.com/stronk7/moo…

…dle into MOODLE_21_STABLE
  • Loading branch information...
commit bbdd6f2dc1067dea7a6fa2ada4f0f715a5d9996e 2 parents f738eb0 + 5299507
@samhemelryk samhemelryk authored
View
8 mod/glossary/edit_form.php
@@ -18,6 +18,11 @@ function definition() {
$definitionoptions = $this->_customdata['definitionoptions'];
$attachmentoptions = $this->_customdata['attachmentoptions'];
+ $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ // Prepare format_string/text options
+ $fmtoptions = array(
+ 'context' => $context);
+
//-------------------------------------------------------------------------------
$mform->addElement('header', 'general', get_string('general', 'form'));
@@ -30,6 +35,9 @@ function definition() {
$mform->addRule('definition_editor', get_string('required'), 'required', null, 'client');
if ($categories = $DB->get_records_menu('glossary_categories', array('glossaryid'=>$glossary->id), 'name ASC', 'id, name')){
+ foreach ($categories as $id => $name) {
+ $categories[$id] = format_string($name, true, $fmtoptions);
+ }
$categories = array(0 => get_string('notcategorised', 'glossary')) + $categories;
$categoriesEl = $mform->addElement('select', 'categories', get_string('categories', 'glossary'), $categories);
$categoriesEl->setMultiple(true);
View
12 mod/glossary/editcategories.php
@@ -79,6 +79,10 @@
$PAGE->set_heading($course->fullname);
echo $OUTPUT->header();
+// Prepare format_string/text options
+$fmtoptions = array(
+ 'context' => $context);
+
if ( $hook >0 ) {
if ( $action == "edit" ) {
@@ -118,7 +122,7 @@
echo "<p>" . get_string("delete"). " " . get_string("category","glossary"). "</p>";
echo $OUTPUT->box_start('generalbox boxaligncenter errorboxcontent boxwidthnarrow');
- echo "<div class=\"boxaligncenter deletecatconfirm\">".format_text($category->name, FORMAT_PLAIN)."<br/>";
+ echo "<div class=\"boxaligncenter deletecatconfirm\">".format_string($category->name, true, $fmtoptions)."<br/>";
$num_entries = $DB->count_records("glossary_entries_categories", array("categoryid"=>$category->id));
if ( $num_entries ) {
@@ -162,10 +166,10 @@
echo "<h3 class=\"main\">" . get_string("add"). " " . get_string("category","glossary"). "</h3>";
echo $OUTPUT->box_start('generalbox boxaligncenter errorboxcontent boxwidthnarrow');
- echo "<div>" . get_string("duplicatedcategory","glossary") ."</div>";
+ echo "<div>" . get_string("duplicatecategory","glossary") ."</div>";
echo $OUTPUT->box_end();
- redirect("editcategories.php?id=$cm->id&amp;action=add&&amp;name=$name");
+ redirect("editcategories.php?id=$cm->id&amp;action=add&amp;name=$name");
} else {
$action = "";
@@ -215,7 +219,7 @@
<tr>
<td style="width:80%" align="left">
<?php
- echo "<span class=\"bold\">".format_text($category->name, FORMAT_PLAIN)."</span> <span>($num_entries " . get_string("entries","glossary") . ")</span>";
+ echo "<span class=\"bold\">".format_string($category->name, true, $fmtoptions)."</span> <span>($num_entries " . get_string("entries","glossary") . ")</span>";
?>
</td>
<td style="width:19%" align="center" class="action">
View
1  mod/glossary/lang/en/glossary.php
@@ -123,6 +123,7 @@
$string['displayformatfullwithoutauthor'] = 'Full without author';
$string['displayformats'] = 'Display formats';
$string['displayformatssetup'] = 'Display formats setup';
+$string['duplicatecategory'] = 'Duplicate category';
$string['duplicateentry'] = 'Duplicate entry';
$string['editalways'] = 'Edit always';
$string['editalways_help'] = 'This setting specifies whether entries are always editable or whether students can only edit their entries during a configured editing time (usually 30 minutes).';
View
8 mod/glossary/lib.php
@@ -1645,6 +1645,10 @@ function glossary_print_categories_menu($cm, $glossary, $hook, $category) {
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+ // Prepare format_string/text options
+ $fmtoptions = array(
+ 'context' => $context);
+
echo '<table border="0" width="100%">';
echo '<tr>';
@@ -1674,7 +1678,7 @@ function glossary_print_categories_menu($cm, $glossary, $hook, $category) {
$selected = $url;
}
}
- $menu[$url] = clean_text($currentcategory->name); //Only clean, not filters
+ $menu[$url] = format_string($currentcategory->name, true, $fmtoptions);
}
}
if ( !$selected ) {
@@ -1682,7 +1686,7 @@ function glossary_print_categories_menu($cm, $glossary, $hook, $category) {
}
if ( $category ) {
- echo format_text($category->name, FORMAT_PLAIN);
+ echo format_string($category->name, true, $fmtoptions);
} else {
if ( $hook == GLOSSARY_SHOW_NOT_CATEGORISED ) {
View
7 mod/glossary/print.php
@@ -54,6 +54,10 @@
require_course_login($course, true, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+// Prepare format_string/text options
+$fmtoptions = array(
+ 'context' => $context);
+
$PAGE->set_pagelayout('print');
$PAGE->set_title(get_string("modulenameplural", "glossary"));
$PAGE->set_heading($course->fullname);
@@ -178,9 +182,11 @@
// Setting the pivot for the current entry
$pivot = $entry->glossarypivot;
$upperpivot = $textlib->strtoupper($pivot);
+ $pivottoshow = $textlib->strtoupper(format_string($pivot, true, $fmtoptions));
// Reduce pivot to 1cc if necessary
if ( !$fullpivot ) {
$upperpivot = $textlib->substr($upperpivot, 0, 1);
+ $pivottoshow = $textlib->substr($pivottoshow, 0, 1);
}
// If there's group break
@@ -190,7 +196,6 @@
if ( $printpivot ) {
$currentpivot = $upperpivot;
- $pivottoshow = $currentpivot;
if ( isset($entry->userispivot) ) {
// printing the user icon if defined (only when browsing authors)
$user = $DB->get_record("user", array("id"=>$entry->userid));
View
7 mod/glossary/view.php
@@ -50,6 +50,10 @@
require_course_login($course->id, true, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+// Prepare format_string/text options
+$fmtoptions = array(
+ 'context' => $context);
+
require_once($CFG->dirroot . '/comment/lib.php');
comment::init();
@@ -417,9 +421,11 @@
// Setting the pivot for the current entry
$pivot = $entry->glossarypivot;
$upperpivot = $textlib->strtoupper($pivot);
+ $pivottoshow = $textlib->strtoupper(format_string($pivot, true, $fmtoptions));
// Reduce pivot to 1cc if necessary
if ( !$fullpivot ) {
$upperpivot = $textlib->substr($upperpivot, 0, 1);
+ $pivottoshow = $textlib->substr($pivottoshow, 0, 1);
}
// if there's a group break
@@ -433,7 +439,6 @@
echo '<table cellspacing="0" class="glossarycategoryheader">';
echo '<tr>';
- $pivottoshow = $currentpivot;
if ( isset($entry->userispivot) ) {
// printing the user icon if defined (only when browsing authors)
echo '<th align="left">';
Please sign in to comment.
Something went wrong with that request. Please try again.