moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-43497 Language: Allow course language to be overridden

Browse source
This commit is contained in:
Brian King 2013-12-24 14:00:49 +01:00
parent 76e4de31cc
commit c484af5aa6
7 changed files with 70 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/enrollib.php
View file

@ -2146,16 +2146,11 @@ abstract class enrol_plugin {
* @param progress_trace $trace
*/
protected function notify_expiry_enrolled($user, $ue, progress_trace $trace) {
global $CFG, $SESSION;
global $CFG;
$name = $this->get_name();
// Some nasty hackery to get strings and dates localised for target user.
$sessionlang = isset($SESSION->lang) ? $SESSION->lang : null;
if (get_string_manager()->translation_exists($user->lang, false)) {
$SESSION->lang = $user->lang;
moodle_setlocale();
}
$oldforcelang = force_current_language($user->lang);
$enroller = $this->get_enroller($ue->enrolid);
$context = context_course::instance($ue->courseid);
@ -2189,10 +2184,7 @@ abstract class enrol_plugin {
$trace->output("error notifying user $ue->userid that enrolment in course $ue->courseid expires on ".userdate($ue->timeend, '', $CFG->timezone), 1);
}
if ($SESSION->lang !== $sessionlang) {
$SESSION->lang = $sessionlang;
moodle_setlocale();
}
force_current_language($oldforcelang);
}
/**
@ -2207,7 +2199,7 @@ abstract class enrol_plugin {
* @param progress_trace $trace
*/
protected function notify_expiry_enroller($eid, $users, progress_trace $trace) {
global $DB, $SESSION;
global $DB;
$name = $this->get_name();
@ -2218,12 +2210,7 @@ abstract class enrol_plugin {
$enroller = $this->get_enroller($instance->id);
$admin = get_admin();
// Some nasty hackery to get strings and dates localised for target user.
$sessionlang = isset($SESSION->lang) ? $SESSION->lang : null;
if (get_string_manager()->translation_exists($enroller->lang, false)) {
$SESSION->lang = $enroller->lang;
moodle_setlocale();
}
$oldforcelang = force_current_language($enroller->lang);
foreach($users as $key=>$info) {
$users[$key] = '* '.$info['fullname'].' - '.userdate($info['timeend'], '', $enroller->timezone);
@ -2258,10 +2245,7 @@ abstract class enrol_plugin {
$trace->output("error notifying user $enroller->id about all expiring $name enrolments in course $instance->courseid", 1);
}
if ($SESSION->lang !== $sessionlang) {
$SESSION->lang = $sessionlang;
moodle_setlocale();
}
force_current_language($oldforcelang);
}
/**