MDL-39265 feedback: Language string improvements

AMOS BEGIN
 MOV [multiple_submit,mod_feedback],[multiplesubmit,mod_feedback]
 MOV [emailnotification_help,mod_feedback],[email_notification_help,mod_feedback]
AMOS END

mod/feedback/lang/en/feedback.php

@@ -92,8 +92,7 @@ $string['drop_feedback'] = 'Remove from this course';
 $string['edit_item'] = 'Edit question';
 $string['edit_items'] = 'Edit questions';
 $string['email_notification'] = 'Send e-mail notifications';
-$string['emailnotification'] = 'emailnotifications';
+$string['email_notification_help'] = 'If enabled, administrators receive email notification of feedback submissions.';
-$string['emailnotification_help'] = 'If enabled, administrators receive email notification of feedback submissions.';
 $string['emailteachermail'] = '{$a->username} has completed feedback activity : \'{$a->feedback}\'
 
 You can view it here:
@@ -105,8 +104,7 @@ $string['entries_saved'] = 'Your answers have been saved. Thank you.';
 $string['export_questions'] = 'Export questions';
 $string['export_to_excel'] = 'Export to Excel';
 $string['feedback:addinstance'] = 'Add a new feedback';
-$string['feedbackclose'] = 'Available to';
+$string['feedbackclose'] = 'Allow answers to';
-$string['feedbackcloses'] = 'Feedback closes';
 $string['feedback:complete'] = 'Complete a feedback';
 $string['feedback:createprivatetemplate'] = 'Create private template';
 $string['feedback:createpublictemplate'] = 'Create public template';
@@ -116,8 +114,7 @@ $string['feedback:edititems'] = 'Edit items';
 $string['feedback_is_not_for_anonymous'] = 'feedback is not for anonymous';
 $string['feedback_is_not_open'] = 'The feedback is not open';
 $string['feedback:mapcourse'] = 'Map courses to global feedbacks';
-$string['feedbackopen'] = 'Available from';
+$string['feedbackopen'] = 'Allow answers from';
-$string['feedbackopens'] = 'Feedback opens';
 $string['feedback:receivemail'] = 'Receive email notification';
 $string['feedback:view'] = 'View a feedback';
 $string['feedback:viewanalysepage'] = 'View the analysis page after submit';
@@ -182,8 +179,7 @@ $string['multichoice'] = 'Multiple choice';
 $string['multichoicerated'] = 'Multiple choice (rated)';
 $string['multichoicetype'] = 'Multiple choice type';
 $string['multichoice_values'] = 'Multiple choice values';
-$string['multiple_submit'] = 'Allow multiple submissions';
+$string['multiplesubmit'] = 'Allow multiple submissions';
-$string['multiplesubmit'] = 'Multiple submissions';
 $string['multiplesubmit_help'] = 'If enabled for anonymous surveys, users can submit feedback an unlimited number of times.';
 $string['name'] = 'Name';
 $string['name_required'] = 'Name required';
@@ -278,15 +274,10 @@ $string['textfield_maxlength'] = 'Maximum characters accepted';
 $string['textfield_size'] = 'Textfield width';
 $string['there_are_no_settings_for_recaptcha'] = 'There are no settings for captcha';
 $string['this_feedback_is_already_submitted'] = 'You\'ve already completed this activity.';
-$string['timeclose'] = 'Time to close';
-$string['timeclose_help'] = 'You can specify times when the feedback is accessible for people to answer the questions. If the checkbox is not ticked there is no limit defined.';
-$string['timeopen'] = 'Time to open';
-$string['timeopen_help'] = 'You can specify times when the feedback is accessible for people to answer the questions. If the checkbox is not ticked there is no limit defined.';
 $string['typemissing'] = 'missing value "type"';
 $string['update_item'] = 'Save changes to question';
-$string['url_for_continue'] = 'URL for continue-button';
+$string['url_for_continue'] = 'Link to next activity';
-$string['url_for_continue_help'] = 'By default after a feedback is submitted the target of the continue button is the course page. You can define here another target URL for this continue button.';
+$string['url_for_continue_help'] = 'After submitting the feedback, a continue button is displayed, which links to the course page. Alternatively, it may link to the next activity if the URL of the activity is entered here.';
-$string['url_for_continue_button'] = 'Link to next activity';
 $string['use_one_line_for_each_value'] = '<br />Use one line for each answer!';
 $string['use_this_template'] = 'Use this template';
 $string['using_templates'] = 'Use a template';

mod/feedback/mod_form.php

@@ -62,7 +62,6 @@ class mod_feedback_mod_form extends moodleform_mod {
                          ' ',
                          false);
 
-        $mform->addHelpButton('enableopengroup', 'timeopen', 'feedback');
         $mform->disabledIf('enableopengroup', 'openenable', 'notchecked');
 
         $enableclosegroup = array();
@@ -77,7 +76,6 @@ class mod_feedback_mod_form extends moodleform_mod {
                          ' ',
                          false);
 
-        $mform->addHelpButton('enableclosegroup', 'timeclose', 'feedback');
         $mform->disabledIf('enableclosegroup', 'closeenable', 'notchecked');
 
         //-------------------------------------------------------------------------------
@@ -105,7 +103,7 @@ class mod_feedback_mod_form extends moodleform_mod {
             $multiple_submit_value = $feedback->multiple_submit ? get_string('yes') : get_string('no');
             $mform->addElement('text',
                                'multiple_submit_static',
-                               get_string('multiple_submit', 'feedback'),
+                               get_string('multiplesubmit', 'feedback'),
                                array('size'=>'4',
                                     'disabled'=>'disabled',
                                     'value'=>$multiple_submit_value));
@@ -116,13 +114,13 @@ class mod_feedback_mod_form extends moodleform_mod {
         } else {
             $mform->addElement('selectyesno',
                                'multiple_submit',
-                               get_string('multiple_submit', 'feedback'));
+                               get_string('multiplesubmit', 'feedback'));
 
             $mform->addHelpButton('multiple_submit', 'multiplesubmit', 'feedback');
         }
 
         $mform->addElement('selectyesno', 'email_notification', get_string('email_notification', 'feedback'));
-        $mform->addHelpButton('email_notification', 'emailnotification', 'feedback');
+        $mform->addHelpButton('email_notification', 'email_notification', 'feedback');
 
         $mform->addElement('selectyesno', 'autonumbering', get_string('autonumbering', 'feedback'));
         $mform->addHelpButton('autonumbering', 'autonumbering', 'feedback');
@@ -142,7 +140,7 @@ class mod_feedback_mod_form extends moodleform_mod {
 
         $mform->addElement('text',
                            'site_after_submit',
-                           get_string('url_for_continue_button', 'feedback'),
+                           get_string('url_for_continue', 'feedback'),
                            array('size'=>'64', 'maxlength'=>'255'));
 
         $mform->setType('site_after_submit', PARAM_TEXT);

mod/feedback/view.php

@@ -182,7 +182,7 @@ if (has_capability('mod/feedback:edititems', $context)) {
     if ($feedback->timeclose) {
         echo $OUTPUT->box_start('feedback_info');
         echo '<span class="feedback_info">';
-        echo get_string('timeclose', 'feedback').': ';
+        echo get_string('feedbackclose', 'feedback').': ';
         echo '</span>';
         echo '<span class="feedback_info_value">';
         echo userdate($feedback->timeclose);