diff --git a/course/edit_form.php b/course/edit_form.php index 1b1c976014e..d13a59f70dd 100644 --- a/course/edit_form.php +++ b/course/edit_form.php @@ -74,14 +74,14 @@ class course_edit_form extends moodleform { $mform->setDefault('category', $category->id); $mform->setType('category', PARAM_INT); - $mform->addElement('text','fullname', get_string('fullname'),'maxlength="254" size="50"'); - $mform->setHelpButton('fullname', array('coursefullname', get_string('fullname')), true); + $mform->addElement('text','fullname', get_string('fullnamecourse'),'maxlength="254" size="50"'); + $mform->setHelpButton('fullname', array('coursefullname', get_string('fullnamecourse')), true); $mform->setDefault('fullname', get_string('defaultcoursefullname')); $mform->addRule('fullname', get_string('missingfullname'), 'required', null, 'client'); $mform->setType('fullname', PARAM_MULTILANG); - $mform->addElement('text','shortname', get_string('shortname'),'maxlength="100" size="20"'); - $mform->setHelpButton('shortname', array('courseshortname', get_string('shortname')), true); + $mform->addElement('text','shortname', get_string('shortnamecourse'),'maxlength="100" size="20"'); + $mform->setHelpButton('shortname', array('courseshortname', get_string('shortnamecourse')), true); $mform->setDefault('shortname', get_string('defaultcourseshortname')); $mform->addRule('shortname', get_string('missingshortname'), 'required', null, 'client'); $mform->setType('shortname', PARAM_MULTILANG); diff --git a/course/lib.php b/course/lib.php index d5853e58829..f646aaf7b6b 100644 --- a/course/lib.php +++ b/course/lib.php @@ -263,7 +263,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per } echo "".get_string('time')."\n"; echo "".get_string('ip_address')."\n"; - echo "".get_string('fullname')."\n"; + echo "".get_string('fullnamecourse')."\n"; echo "".get_string('action')."\n"; echo "".get_string('info')."\n"; echo "\n"; @@ -383,7 +383,7 @@ function print_mnet_log($hostid, $course, $user=0, $date=0, $order="l.time ASC", } echo "".get_string('time')."\n"; echo "".get_string('ip_address')."\n"; - echo "".get_string('fullname')."\n"; + echo "".get_string('fullnamecourse')."\n"; echo "".get_string('action')."\n"; echo "".get_string('info')."\n"; echo "\n"; @@ -452,7 +452,7 @@ function print_log_csv($course, $user, $date, $order='l.time DESC', $modname, $modid, $modaction, $groupid) { $text = get_string('course')."\t".get_string('time')."\t".get_string('ip_address')."\t". - get_string('fullname')."\t".get_string('action')."\t".get_string('info'); + get_string('fullnamecourse')."\t".get_string('action')."\t".get_string('info'); if (!$logs = build_logs_array($course, $user, $date, $order, '', '', $modname, $modid, $modaction, $groupid)) { @@ -568,7 +568,7 @@ function print_log_xls($course, $user, $date, $order='l.time DESC', $modname, $worksheet = array(); $headers = array(get_string('course'), get_string('time'), get_string('ip_address'), - get_string('fullname'), get_string('action'), get_string('info')); + get_string('fullnamecourse'), get_string('action'), get_string('info')); // Creating worksheets for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) { @@ -681,7 +681,7 @@ function print_log_ods($course, $user, $date, $order='l.time DESC', $modname, $worksheet = array(); $headers = array(get_string('course'), get_string('time'), get_string('ip_address'), - get_string('fullname'), get_string('action'), get_string('info')); + get_string('fullnamecourse'), get_string('action'), get_string('info')); // Creating worksheets for ($wsnumber = 1; $wsnumber <= $nroPages; $wsnumber++) { diff --git a/course/pending.php b/course/pending.php index 2fc6f89f95b..5a4e672faf7 100644 --- a/course/pending.php +++ b/course/pending.php @@ -99,7 +99,7 @@ $table->cellpadding = 4; $table->cellspacing = 3; $table->align = array('center','center','center','center','center','center','center'); - $table->head = array(' ',get_string('shortname'),get_string('fullname'),get_string('requestedby'),get_string('summary'), + $table->head = array(' ',get_string('shortnamecourse'),get_string('fullnamecourse'),get_string('requestedby'),get_string('summary'), get_string('requestreason'),''); $strrequireskey = get_string('requireskey'); foreach ($pending as $course) { diff --git a/course/request_form.php b/course/request_form.php index 53e1b924c63..6598e5d66e5 100644 --- a/course/request_form.php +++ b/course/request_form.php @@ -6,11 +6,11 @@ class course_request_form extends moodleform { function definition() { $mform =& $this->_form; - $mform->addElement('text', 'fullname', get_string('fullname'), 'maxlength="254" size="50"'); + $mform->addElement('text', 'fullname', get_string('fullnamecourse'), 'maxlength="254" size="50"'); $mform->addRule('fullname', get_string('missingfullname'), 'required', null, 'client'); $mform->setType('fullname', PARAM_TEXT); - $mform->addElement('text', 'shortname', get_string('shortname'), 'maxlength="100" size="20"'); + $mform->addElement('text', 'shortname', get_string('shortnamecourse'), 'maxlength="100" size="20"'); $mform->addRule('shortname', get_string('missingshortname'), 'required', null, 'client'); $mform->setType('shortname', PARAM_TEXT); diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php index ba322b4af26..604a1ca0186 100644 --- a/lang/en_utf8/moodle.php +++ b/lang/en_utf8/moodle.php @@ -671,6 +671,8 @@ $string['frontpagenews'] = 'News items'; $string['frontpagetopiconly'] = 'Topic section'; $string['fulllistofcourses'] = 'All courses'; $string['fullname'] = 'Full name'; +$string['fullnamecourse'] = 'Course full name'; +$string['fullnameuser'] = 'User full name'; $string['fullnamedisplay'] = '$a->firstname $a->lastname'; $string['fullprofile'] = 'Full profile'; $string['fullsitename'] = 'Full site name'; @@ -1324,6 +1326,8 @@ $string['serverlocaltime'] = 'Server\'s local time'; $string['setcategorytheme'] = 'Set Category Theme'; $string['settings'] = 'Settings'; $string['shortname'] = 'Short name'; +$string['shortnamecourse'] = 'Course short name'; +$string['shortnameuser'] = 'User short name'; $string['shortnamecollisionwarning'] = '[*] = This shortname is already in use by a course and will need to be changed upon approval'; $string['shortnametaken'] = 'Short name is already used for another course ($a)'; $string['shortsitename'] = 'Short name for site (eg single word)'; @@ -1644,4 +1648,4 @@ $string['zippingbackup'] = 'Zipping backup'; $string['authenticationplugins'] = 'Authentication Plugins'; $string['chooseauthmethod'] = 'Choose authentication plugin'; -?> \ No newline at end of file +?> diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index b90dd11517b..41827b801d8 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -1081,7 +1081,7 @@ class assignment_base { } $tableheaders = array('', - get_string('fullname'), + get_string('fullnameuser'), get_string('grade'), get_string('comment', 'assignment'), get_string('lastmodified').' ('.$course->student.')', diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php index 046cb3a3522..464da8a28dc 100644 --- a/mod/resource/type/file/resource.class.php +++ b/mod/resource/type/file/resource.class.php @@ -33,9 +33,9 @@ class resource_file extends resource_base { 'courseid' => array('langstr' => 'id', 'value' => $this->course->id), - 'coursefullname' => array('langstr' => get_string('fullname'), + 'coursefullname' => array('langstr' => get_string('fullnamecourse'), 'value' => $this->course->fullname), - 'courseshortname' => array('langstr' => get_string('shortname'), + 'courseshortname' => array('langstr' => get_string('shortnamecourse'), 'value' => $this->course->shortname), 'courseidnumber' => array('langstr' => get_string('idnumbercourse'), 'value' => $this->course->idnumber), @@ -89,7 +89,7 @@ class resource_file extends resource_base { 'value' => $USER->firstname), 'userlastname' => array('langstr' => get_string('lastname'), 'value' => $USER->lastname), - 'userfullname' => array('langstr' => get_string('fullname'), + 'userfullname' => array('langstr' => get_string('fullnameuser'), 'value' => fullname($USER)), 'useremail' => array('langstr' => get_string('email'), 'value' => $USER->email), diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php index f25c2b5245c..a492a373498 100644 --- a/mod/resource/type/repository/resource.class.php +++ b/mod/resource/type/repository/resource.class.php @@ -42,9 +42,9 @@ function set_parameters() { 'courseid' => array('langstr' => 'id', 'value' => $this->course->id), - 'coursefullname' => array('langstr' => get_string('fullname'), + 'coursefullname' => array('langstr' => get_string('fullnamecourse'), 'value' => $this->course->fullname), - 'courseshortname' => array('langstr' => get_string('shortname'), + 'courseshortname' => array('langstr' => get_string('shortnamecourse'), 'value' => $this->course->shortname), 'courseidnumber' => array('langstr' => get_string('idnumbercourse'), 'value' => $this->course->idnumber), @@ -98,7 +98,7 @@ function set_parameters() { 'value' => $USER->firstname), 'userlastname' => array('langstr' => get_string('lastname'), 'value' => $USER->lastname), - 'userfullname' => array('langstr' => get_string('fullname'), + 'userfullname' => array('langstr' => get_string('fullnameuser'), 'value' => fullname($USER)), 'useremail' => array('langstr' => get_string('email'), 'value' => $USER->email), diff --git a/user/extendenrol.php b/user/extendenrol.php index 1adc0344bac..33926c2bd06 100644 --- a/user/extendenrol.php +++ b/user/extendenrol.php @@ -116,7 +116,7 @@ print_heading($title . helpbutton('extendenrol', $title, 'moodle', true, false, echo "
\n"; echo ''; echo ''; -$table->head = array (get_string('fullname'), get_string('enrolmentstart'), get_string('enrolmentend'), get_string('extendperiod'), get_string('startingfrom')); +$table->head = array (get_string('fullnameuser'), get_string('enrolmentstart'), get_string('enrolmentend'), get_string('extendperiod'), get_string('startingfrom')); $table->align = array ('left', 'center', 'center', 'center'); $table->width = "600"; $nochange = get_string('nochange'); diff --git a/user/filters/lib.php b/user/filters/lib.php index 85db4d69c3b..e4f3445e3be 100644 --- a/user/filters/lib.php +++ b/user/filters/lib.php @@ -98,7 +98,7 @@ class user_filtering { switch ($fieldname) { case 'username': return new user_filter_text('username', get_string('username'), $advanced, 'username'); - case 'realname': return new user_filter_text('realname', get_string('fullname'), $advanced, sql_fullname()); + case 'realname': return new user_filter_text('realname', get_string('fullnameuser'), $advanced, sql_fullname()); case 'lastname': return new user_filter_text('lastname', get_string('lastname'), $advanced, 'lastname'); case 'firstname': return new user_filter_text('firstname', get_string('firstname'), $advanced, 'firstname'); case 'email': return new user_filter_text('email', get_string('email'), $advanced, 'email'); diff --git a/user/groupextendenrol.php b/user/groupextendenrol.php index e941141f382..aa9f2a7ae07 100755 --- a/user/groupextendenrol.php +++ b/user/groupextendenrol.php @@ -113,7 +113,7 @@ print_heading($title . helpbutton('groupextendenrol', $title, 'moodle', true, fa echo ''; echo ''; echo ''; -$table->head = array (get_string('fullname'), get_string('enrolmentstart'), get_string('enrolmentend')); +$table->head = array (get_string('fullnameuser'), get_string('enrolmentstart'), get_string('enrolmentend')); $table->align = array ('left', 'center', 'center', 'center'); $table->width = "600"; $nochange = get_string('nochange'); diff --git a/user/index.php b/user/index.php index 3eace2f6109..1a7f0a38c92 100644 --- a/user/index.php +++ b/user/index.php @@ -290,7 +290,7 @@ /// Define a table showing a list of users in the current role selection $tablecolumns = array('userpic', 'fullname'); - $tableheaders = array(get_string('userpic'), get_string('fullname')); + $tableheaders = array(get_string('userpic'), get_string('fullnameuser')); if ($mode === MODE_BRIEF && !isset($hiddenfields['city'])) { $tablecolumns[] = 'city'; $tableheaders[] = get_string('city');