From: tjhunt <tjhunt>
Date: Wed, 30 Jan 2008 16:34:04 +0000 (+0000)
Subject: MDL-13253 - Should use separate language strings for user and module idnumber. Merged... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d343bd2114b4a08dd163126a8bb619eaa1719dab;p=moodle.git

MDL-13253 - Should use separate language strings for user and module idnumber. Merged from MOODLE_19_STABLE.
---

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index f75df061da..427bcaaad4 100644
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -116,7 +116,7 @@ if (has_capability('moodle/grade:manage', $systemcontext)
         $temp->add(new admin_setting_configmultiselect('grade_item_advanced', get_string('gradeitemadvanced', 'grades'), get_string('configgradeitemadvanced', 'grades'),
                                                        array('iteminfo', 'idnumber', 'gradepass', 'plusfactor', 'multfactor', 'display', 'decimals', 'hiddenuntil', 'locktime'),
                                                        array('iteminfo' => get_string('iteminfo', 'grades'),
-                                                             'idnumber' => get_string('idnumber'),
+                                                             'idnumber' => get_string('idnumbermod'),
                                                              'gradetype' => get_string('gradetype', 'grades'),
                                                              'scaleid' => get_string('scale'),
                                                              'grademin' => get_string('grademin', 'grades'),
diff --git a/course/moodleform_mod.php b/course/moodleform_mod.php
index 0cf20079b6..0c6ee6c948 100644
--- a/course/moodleform_mod.php
+++ b/course/moodleform_mod.php
@@ -254,8 +254,8 @@ class moodleform_mod extends moodleform {
         }
 
         $mform->addElement('modvisible', 'visible', get_string('visible'));
-        $mform->addElement('text', 'cmidnumber', get_string('idnumber'));
-        $mform->setHelpButton('cmidnumber', array('cmidnumber', get_string('idnumber')), true);
+        $mform->addElement('text', 'cmidnumber', get_string('idnumbermod'));
+        $mform->setHelpButton('cmidnumber', array('cmidnumber', get_string('idnumbermod')), true);
 
         if ($this->_features->gradecat) {
             $categories = grade_get_categories_menu($COURSE->id, $outcomesused);
diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php
index 3654e268ed..ae9eeedcbd 100644
--- a/grade/edit/tree/item_form.php
+++ b/grade/edit/tree/item_form.php
@@ -41,8 +41,8 @@ class edit_item_form extends moodleform {
         $mform->setHelpButton('iteminfo', array(false, get_string('iteminfo', 'grades'),
                 false, true, false, get_string('iteminfohelp', 'grades')));
 
-        $mform->addElement('text', 'idnumber', get_string('idnumber'));
-        $mform->setHelpButton('idnumber', array(false, get_string('idnumber'),
+        $mform->addElement('text', 'idnumber', get_string('idnumbermod'));
+        $mform->setHelpButton('idnumber', array(false, get_string('idnumbermod'),
                 false, true, false, get_string('idnumberhelp', 'grades')));
 
         $options = array(GRADE_TYPE_NONE=>get_string('typenone', 'grades'),
diff --git a/grade/edit/tree/outcomeitem_form.php b/grade/edit/tree/outcomeitem_form.php
index 25d4b7f9cb..899da193a8 100644
--- a/grade/edit/tree/outcomeitem_form.php
+++ b/grade/edit/tree/outcomeitem_form.php
@@ -41,8 +41,8 @@ class edit_outcomeitem_form extends moodleform {
         $mform->setHelpButton('iteminfo', array(false, get_string('iteminfo', 'grades'),
                 false, true, false, get_string('iteminfohelp', 'grades')));
 
-        $mform->addElement('text', 'idnumber', get_string('idnumber'));
-        $mform->setHelpButton('idnumber', array(false, get_string('idnumber'),
+        $mform->addElement('text', 'idnumber', get_string('idnumbermod'));
+        $mform->setHelpButton('idnumber', array(false, get_string('idnumbermod'),
                 false, true, false, get_string('idnumberhelp', 'grades')));
 
         // allow setting of outcomes on module items too
diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 5bddcd3e9b..88ec75793c 100644
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -776,6 +776,7 @@ $string['htmlfilesonly'] = 'HTML files only';
 $string['htmlformat'] = 'Pretty HTML format';
 $string['icqnumber'] = 'ICQ number';
 $string['idnumber'] = 'ID number';
+$string['idnumbermod'] = 'ID number';
 $string['idnumbercourse'] = 'Course ID number';
 $string['idnumbertaken'] = 'This ID number is already taken';
 $string['imagealt'] = 'Picture description';