mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-55340-master' of git://github.com/sarjona/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2020-09-03 10:05:21 +08:00
commit 0d1e8aa711
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/feedback/classes/complete_form.php
View File

@ -399,8 +399,8 @@ class mod_feedback_complete_form extends moodleform {
*/ */
protected function add_item_label($item, $element) { protected function add_item_label($item, $element) {
if (strlen($item->label) && ($this->mode == self::MODE_EDIT || $this->mode == self::MODE_VIEW_TEMPLATE)) { if (strlen($item->label) && ($this->mode == self::MODE_EDIT || $this->mode == self::MODE_VIEW_TEMPLATE)) {
$name = $element->getLabel(); $name = get_string('nameandlabelformat', 'mod_feedback',
$name = '('.format_string($item->label).') '.$name; (object)['label' => format_string($item->label), 'name' => $element->getLabel()]);
$element->setLabel($name); $element->setLabel($name);
} }
} }

10
mod/feedback/classes/responses_table.php
View File

@ -314,7 +314,15 @@ class mod_feedback_responses_table extends table_sql {
$tablecolumns[] = "val{$nr}"; $tablecolumns[] = "val{$nr}";
$itemobj = feedback_get_item_class($item->typ); $itemobj = feedback_get_item_class($item->typ);
$tableheaders[] = $itemobj->get_display_name($item, $headernamepostfix); $columnheader = $itemobj->get_display_name($item, $headernamepostfix);
if (!$this->is_downloading()) {
$columnheader = shorten_text($columnheader);
}
if (strval($item->label) !== '') {
$columnheader = get_string('nameandlabelformat', 'mod_feedback',
(object)['label' => format_string($item->label), 'name' => $columnheader]);
}
$tableheaders[] = $columnheader;
} }
// Add 'Delete entry' column. // Add 'Delete entry' column.

1
mod/feedback/lang/en/feedback.php
View File

@ -195,6 +195,7 @@ $string['multiplesubmit'] = 'Allow multiple submissions';
$string['multiplesubmit_help'] = 'If enabled for anonymous surveys, users can submit feedback an unlimited number of times.'; $string['multiplesubmit_help'] = 'If enabled for anonymous surveys, users can submit feedback an unlimited number of times.';
$string['name'] = 'Name'; $string['name'] = 'Name';
$string['name_required'] = 'Name required'; $string['name_required'] = 'Name required';
$string['nameandlabelformat'] = '({$a->label}) {$a->name}';
$string['next_page'] = 'Next page'; $string['next_page'] = 'Next page';
$string['no_handler'] = 'No action handler exists for'; $string['no_handler'] = 'No action handler exists for';
$string['no_itemlabel'] = 'No label'; $string['no_itemlabel'] = 'No label';