From: scyrma Date: Mon, 26 Nov 2007 04:10:08 +0000 (+0000) Subject: Fix for par of the missing strings, as reported in MDL-12294 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d417533252895cb83099edfd94f3e4da14052793;p=moodle.git Fix for par of the missing strings, as reported in MDL-12294 --- diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php index 825d06bdd4..4ae894ee6b 100644 --- a/admin/mnet/enr_course_enrol.php +++ b/admin/mnet/enr_course_enrol.php @@ -243,7 +243,6 @@ $str = get_strings(array('enrolmentplugins', 'configuration', 'users', 'administration')); /// Get some language strings -$strassignusers = get_string('assignusers', 'role'); $strpotentialusers = get_string('potentialusers', 'role'); $strexistingusers = get_string('existingusers', 'role'); $straction = get_string('assignroles', 'role'); diff --git a/admin/roles/assign.php b/admin/roles/assign.php index 01a3d73fc4..6baf3b8602 100755 --- a/admin/roles/assign.php +++ b/admin/roles/assign.php @@ -75,7 +75,6 @@ /// Get some language strings - $strassignusers = get_string('assignusers', 'role'); $strpotentialusers = get_string('potentialusers', 'role'); $strexistingusers = get_string('existingusers', 'role'); $straction = get_string('assignroles', 'role'); diff --git a/admin/roles/override.php b/admin/roles/override.php index 1566552a20..4432d6c426 100755 --- a/admin/roles/override.php +++ b/admin/roles/override.php @@ -58,7 +58,6 @@ /// Get some language strings $strroletooverride = get_string('roletooverride', 'role'); - $stroverrideusers = get_string('overrideusers', 'role'); $straction = get_string('overrideroles', 'role'); $strcurrentrole = get_string('currentrole', 'role'); $strparticipants = get_string('participants'); diff --git a/blocks/admin_bookmarks/create.php b/blocks/admin_bookmarks/create.php index cf44ab0f89..bea79e971c 100644 --- a/blocks/admin_bookmarks/create.php +++ b/blocks/admin_bookmarks/create.php @@ -32,7 +32,7 @@ if ($section = optional_param('section', '', PARAM_ALPHAEXT) and confirm_sesskey } else { - error(get_string('invaludsection','admin')); + error(get_string('invalidsection','admin')); die; } diff --git a/blog/edit_form.php b/blog/edit_form.php index fdd8086680..510edc5da4 100644 --- a/blog/edit_form.php +++ b/blog/edit_form.php @@ -30,7 +30,7 @@ class blog_edit_form extends moodleform { $mform->addElement('file', 'attachment', get_string('attachment', 'forum')); $mform->addElement('select', 'publishstate', get_string('publishto', 'blog'), blog_applicable_publish_states()); - $mform->setHelpButton('publishstate', array('publish_state', get_string('helppublish', 'blog'), 'blog')); + $mform->setHelpButton('publishstate', array('publish_state', get_string('publishto', 'blog'), 'blog')); if (!empty($CFG->usetags)) { diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php index 36d1797f20..e6a2b01044 100644 --- a/grade/edit/tree/item_form.php +++ b/grade/edit/tree/item_form.php @@ -66,7 +66,7 @@ class edit_item_form extends moodleform { } } $mform->addElement('select', 'scaleid', get_string('scale'), $options); - $mform->setHelpButton('scaleid', array(false, get_string('scaleid', 'grades'), + $mform->setHelpButton('scaleid', array(false, get_string('scale'), false, true, false, get_string('scaleidhelp', 'grades', get_string('gradeitem', 'grades')))); $mform->disabledIf('scaleid', 'gradetype', 'noteq', GRADE_TYPE_SCALE); @@ -340,14 +340,14 @@ class edit_item_form extends moodleform { if (array_key_exists('gradetype', $data) and $data['gradetype'] == GRADE_TYPE_SCALE) { if (empty($data['scaleid'])) { - $errors['scaleid'] = get_String('missingscale', 'grades'); + $errors['scaleid'] = get_string('missingscale', 'grades'); } } if (array_key_exists('grademin', $data) and array_key_exists('grademax', $data)) { if ($data['grademax'] == $data['grademin'] or $data['grademax'] < $data['grademin']) { - $errors['grademin'] = get_String('incorrectminmax', 'grades'); - $errors['grademax'] = get_String('incorrectminmax', 'grades'); + $errors['grademin'] = get_string('incorrectminmax', 'grades'); + $errors['grademax'] = get_string('incorrectminmax', 'grades'); } } diff --git a/grade/edit/tree/outcomeitem_form.php b/grade/edit/tree/outcomeitem_form.php index ea48243d5c..8104e0b848 100644 --- a/grade/edit/tree/outcomeitem_form.php +++ b/grade/edit/tree/outcomeitem_form.php @@ -53,7 +53,7 @@ class edit_outcomeitem_form extends moodleform { } } $mform->addElement('select', 'outcomeid', get_string('outcome', 'grades'), $options); - $mform->setHelpButton('outcomeid', array(false, get_string('outcomeid', 'grades'), + $mform->setHelpButton('outcomeid', array(false, get_string('outcome', 'grades'), false, true, false, get_string('outcomeidhelp', 'grades'))); $mform->addRule('outcomeid', get_string('required'), 'required'); diff --git a/grade/import/xml/lib.php b/grade/import/xml/lib.php index 71c6288bec..e019cdc449 100644 --- a/grade/import/xml/lib.php +++ b/grade/import/xml/lib.php @@ -61,11 +61,11 @@ function import_xml_grades($text, $course, &$error) { break; } - // check if user exist and convert idnember to user id + // check if user exist and convert idnumber to user id if (!$user = get_record('user', 'idnumber', addslashes($result['#']['student'][0]['#']))) { // no user found, abort $status = false; - $error = get_string('baduserid', 'grades'); + $error = get_string('baduser', 'grades'); break; } diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php index 52cd3c729c..3d543d750d 100644 --- a/lang/en_utf8/moodle.php +++ b/lang/en_utf8/moodle.php @@ -1144,6 +1144,7 @@ $string['paymentsorry'] = 'Thank you for your payment! Unfortunately your payme $string['paymentthanks'] = 'Thank you for your payment! You are now enrolled in your course:
\"$a\"'; $string['people'] = 'People'; $string['periodending'] = 'Period ending ($a)'; +$string['personal'] = 'Personal'; $string['personalprofile'] = 'Personal profile'; $string['pictureof'] = 'Picture of $a'; $string['phone'] = 'Phone'; diff --git a/mod/data/lib.php b/mod/data/lib.php index 854956047c..8e8fb71214 100755 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -1938,12 +1938,10 @@ class PresetImporter { } $strblank = get_string('blank', 'data'); - $strnofields = get_string('nofields', 'data'); $strcontinue = get_string('continue'); $strwarning = get_string('mappingwarning', 'data'); $strfieldmappings = get_string('fieldmappings', 'data'); $strnew = get_string('new'); - $strold = get_string('old'); $sesskey = sesskey(); diff --git a/mod/data/preset_class.php b/mod/data/preset_class.php index 5d8884f378..28fe34c149 100644 --- a/mod/data/preset_class.php +++ b/mod/data/preset_class.php @@ -380,12 +380,10 @@ class Data_Preset } $strblank = get_string('blank', 'data'); - $strnofields = get_string('nofields', 'data'); $strcontinue = get_string('continue'); $strwarning = get_string('mappingwarning', 'data'); $strfieldmappings = get_string('fieldmappings', 'data'); $strnew = get_string('new'); - $strold = get_string('old'); $sesskey = sesskey(); diff --git a/mod/data/templates.php b/mod/data/templates.php index 4d40585412..bb1acf3e64 100755 --- a/mod/data/templates.php +++ b/mod/data/templates.php @@ -196,7 +196,7 @@ if ($mode != 'csstemplate' and $mode != 'jstemplate') { // Add all the available fields for this data. echo ''; - helpbutton('tags', get_string('tags','data'), 'data'); + helpbutton('tags', get_string('tags'), 'data'); echo '
'; diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php index 09ea913606..2632abc6b0 100644 --- a/mod/forum/mod_form.php +++ b/mod/forum/mod_form.php @@ -145,7 +145,7 @@ class mod_forum_mod_form extends moodleform_mod { //we want the form to display them if they are set. if ($typevalue[0]=='news'){ $type->addOption(get_string('namenews', 'forum'), 'news'); - $type->setHelpButton(array('forumtypenews', get_string('forumtypenews', 'forum'), 'forum')); + $type->setHelpButton(array('forumtypenews', get_string('forumtype', 'forum'), 'forum')); $type->freeze(); $type->setPersistantFreeze(true); } diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php index 3fbcfebc8e..26c96b88ce 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -92,7 +92,7 @@ } else { // subscribe if ($forum->forcesubscribe == FORUM_DISALLOWSUBSCRIBE && !has_capability('mod/forum:managesubscriptions', $context)) { - error(get_string('disallowsubscribe'),$_SERVER["HTTP_REFERER"]); + error(get_string('disallowsubscribe', 'forum'),$_SERVER["HTTP_REFERER"]); } if (!has_capability('mod/forum:viewdiscussion', $context)) { error("Could not subscribe you to that forum", $_SERVER["HTTP_REFERER"]); diff --git a/mod/lesson/mod_form.php b/mod/lesson/mod_form.php index babd21ed2d..79b1414c22 100644 --- a/mod/lesson/mod_form.php +++ b/mod/lesson/mod_form.php @@ -49,7 +49,7 @@ class mod_lesson_mod_form extends moodleform_mod { } $mform->addElement('select', 'maxanswers', get_string('maximumnumberofanswersbranches', 'lesson'), $numbers); $mform->setDefault('maxanswers', 4); - $mform->setHelpButton('maxanswers', array('maxanswers', get_string('displayformat', 'lesson'), 'lesson')); + $mform->setHelpButton('maxanswers', array('maxanswers', get_string('maximumnumberofanswersbranches', 'lesson'), 'lesson')); //------------------------------------------------------------------------------- $mform->addElement('header', '', get_string('gradeoptions', 'lesson')); @@ -68,7 +68,7 @@ class mod_lesson_mod_form extends moodleform_mod { } $mform->addElement('select', 'grade', get_string('maximumgrade'), $grades); $mform->setDefault('grade', 0); - $mform->setHelpButton('grade', array('grade', get_string('maximumgrade', 'lesson'), 'lesson')); + $mform->setHelpButton('grade', array('grade', get_string('maximumgrade'), 'lesson')); $mform->addElement('selectyesno', 'retake', get_string('canretake', 'lesson', $COURSE->student)); $mform->setHelpButton('retake', array('retake', get_string('canretake', 'lesson', $COURSE->student), 'lesson')); @@ -203,7 +203,7 @@ class mod_lesson_mod_form extends moodleform_mod { } } $mform->addElement('select', 'dependency', get_string('dependencyon', 'lesson'), $options); - $mform->setHelpButton('dependency', array('dependency', get_string('dependency', 'lesson'), 'lesson')); + $mform->setHelpButton('dependency', array('dependency', get_string('dependencyon', 'lesson'), 'lesson')); $mform->setDefault('dependency', 0); $mform->addElement('text', 'timespent', get_string('timespentminutes', 'lesson')); diff --git a/mod/quiz/config.html b/mod/quiz/config.html index ed27632aae..0114098792 100644 --- a/mod/quiz/config.html +++ b/mod/quiz/config.html @@ -149,7 +149,7 @@ $perpage[0] = get_string('allinone', 'quiz'); choose_from_menu($perpage, 'questionsperpage', $form->questionsperpage, ''); - helpbutton('questionsperpage', get_string('questionsperpage'), 'quiz'); + helpbutton('questionsperpage', get_string('questionsperpage', 'quiz'), 'quiz'); ?> diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 4e44355d65..693c166fb2 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -353,7 +353,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true, $showbreak echo ' onchange="getElementById(\'showbreaks\').submit(); return true;" />'; print_string('reordertool', 'quiz'); echo ' '; - helpbutton('reorderingtool', get_string('reorderingtool', 'quiz'), 'quiz'); + helpbutton('reorderingtool', get_string('reordertool', 'quiz'), 'quiz'); echo '
'; echo ''; diff --git a/mod/quiz/report/analysis/report.php b/mod/quiz/report/analysis/report.php index cdfdaa8fc6..289852ad01 100644 --- a/mod/quiz/report/analysis/report.php +++ b/mod/quiz/report/analysis/report.php @@ -7,7 +7,6 @@ class quiz_report extends quiz_default_report { function display($quiz, $cm, $course) { /// This function just displays the report global $CFG, $SESSION, $QTYPES; - $strnoquiz = get_string('noquiz','quiz'); $strnoattempts = get_string('noattempts','quiz'); /// Only print headers if not asked to download data $download = optional_param('download', NULL); diff --git a/mod/quiz/reviewquestion.php b/mod/quiz/reviewquestion.php index e32aa95a65..abb8dbb663 100644 --- a/mod/quiz/reviewquestion.php +++ b/mod/quiz/reviewquestion.php @@ -86,7 +86,6 @@ /// Print the page header $strquizzes = get_string('modulenameplural', 'quiz'); - $strreviewquestion = get_string('reviewquestion', 'quiz'); print_header(); diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php index 0dd3dca01a..5d70b63794 100644 --- a/question/type/calculated/questiontype.php +++ b/question/type/calculated/questiontype.php @@ -966,7 +966,6 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype $maxstr=get_string('max', 'quiz'); $rangeofvaluestr=get_string('minmax','qtype_datasetdependent'); $questionusingstr = get_string('usedinquestion','qtype_calculated'); - $wildcardstr = get_string('wildcard', 'qtype_calculated'); $itemscountstr = get_string('itemscount','qtype_datasetdependent'); $text =''; if (!empty($form->category)) {