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

MDL-49098 feedback: Fix completion message language strings

Browse Source 
With contributions from John Okely
This commit is contained in:
yashvardhanpatel07 2015-02-18 22:52:31 +05:30 committed by John Okely
parent 0c6faf4b51
commit 3da723d548
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/feedback/lang/en/deprecated.txt Normal file
View File

@ -0,0 +1 @@
completed,mod_feedback

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

@ -43,7 +43,6 @@ $string['cannotsavetempl'] = 'saving templates is not allowed';
$string['cannotunmap'] = 'Database problem, unable to unmap';
$string['captcha'] = 'Captcha';
$string['captchanotset'] = 'Captcha hasn\'t been set.';
$string['completed'] = 'completed';
$string['completed_feedbacks'] = 'Submitted answers';
$string['complete_the_form'] = 'Answer the questions...';
$string['completionsubmit'] = 'View as completed if the feedback is submitted';
@ -104,6 +103,7 @@ $string['export_questions'] = 'Export questions';
$string['export_to_excel'] = 'Export to Excel';
$string['eventresponsedeleted'] = 'Response deleted';
$string['eventresponsesubmitted'] = 'Response submitted';
$string['feedbackcompleted'] = '{$a->username} completed {$a->feedbackname}';
$string['feedback:addinstance'] = 'Add a new feedback';
$string['feedbackclose'] = 'Allow answers to';
$string['feedback:complete'] = 'Complete a feedback';
@ -285,3 +285,5 @@ $string['vertical'] = 'vertical';
$string['viewcompleted'] = 'completed feedbacks';
$string['viewcompleted_help'] = 'You may view completed feedback forms, searchable by course and/or by question.
Feedback responses may be exported to Excel.';
// Deprecated since Moodle 3.0.
$string['completed'] = 'completed';

10
mod/feedback/lib.php
View File

@ -2938,7 +2938,6 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
$strfeedbacks = get_string('modulenameplural', 'feedback');
$strfeedback = get_string('modulename', 'feedback');
$strcompleted = get_string('completed', 'feedback');
if ($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
$printusername = fullname($user);
@ -2955,7 +2954,9 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
'userid='.$userid.'&'.
'do_show=showentries';
$postsubject = $strcompleted.': '.$info->username.' -> '.$feedback->name;
$a = array('username' => $info->username, 'feedbackname' => $feedback->name);
$postsubject = get_string('feedbackcompleted', 'feedback', $a);
$posttext = feedback_send_email_text($info, $course);
if ($teacher->mailformat == 1) {
@ -3016,7 +3017,6 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
$strfeedbacks = get_string('modulenameplural', 'feedback');
$strfeedback = get_string('modulename', 'feedback');
$strcompleted = get_string('completed', 'feedback');
$printusername = get_string('anonymous_user', 'feedback');
foreach ($teachers as $teacher) {
@ -3025,7 +3025,9 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
$info->feedback = format_string($feedback->name, true);
$info->url = $CFG->wwwroot.'/mod/feedback/show_entries_anonym.php?id='.$cm->id;
$postsubject = $strcompleted.': '.$info->username.' -> '.$feedback->name;
$a = array('username' => $info->username, 'feedbackname' => $feedback->name);
$postsubject = get_string('feedbackcompleted', 'feedback', $a);
$posttext = feedback_send_email_text($info, $course);
if ($teacher->mailformat == 1) {