L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in latest changes from STABLE

Browse Source
This commit is contained in:
moodler
2004-06-21 13:07:44 +00:00
parent 19ebd1557a
commit a2fa19d87c
3 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+24
View File
@@ -2312,6 +2312,30 @@ function moodle_needs_upgrading() {
/// MISCELLANEOUS ////////////////////////////////////////////////////////////////////
function moodle_setlocale($locale='') {
global $SESSION, $USER, $CFG;
if ($locale) {
$CFG->locale = $locale;
} else if (!empty($CFG->courselang) and ($CFG->courselang != $CFG->lang) ) {
$CFG->locale = get_string('locale');
} else if (!empty($SESSION->lang) and ($SESSION->lang != $CFG->lang) ) {
$CFG->locale = get_string('locale');
} else if (!empty($USER->lang) and ($USER->lang != $CFG->lang) ) {
$CFG->locale = get_string('locale');
} else if (empty($CFG->locale)) {
$CFG->locale = get_string('locale');
set_config('locale', $CFG->locale); // cache it to save lookups in future
}
setlocale (LC_TIME, $CFG->locale);
setlocale (LC_COLLATE, $CFG->locale);
if ($CFG->locale != 'tr_TR') { // To workaround a well-known PHP bug with Turkish
setlocale (LC_CTYPE, $CFG->locale);
}
}
function moodle_strtolower ($string, $encoding='') {
/// Converts string to lowercase using most compatible function available
if (function_exists('mb_strtolower')) {
lib/setup.php
+1 -13
View File
@@ -224,20 +224,8 @@
if (empty($CFG->lang)) {
$CFG->lang = "en";
}
if (!empty($SESSION->lang) and ($SESSION->lang != $CFG->lang) ) {
$CFG->locale = get_string('locale');
} else if (!empty($USER->lang) and ($USER->lang != $CFG->lang) ) {
$CFG->locale = get_string('locale');
} else if (empty($CFG->locale)) {
$CFG->locale = get_string('locale');
set_config('locale', $CFG->locale); // cache it to save lookups in future
}
setlocale (LC_TIME, $CFG->locale);
setlocale (LC_COLLATE, $CFG->locale);
if ($CFG->locale != 'tr_TR') { // To workaround a well-known PHP bug with Turkish
setlocale (LC_CTYPE, $CFG->locale);
}
moodle_setlocale();
if (!empty($CFG->opentogoogle)) {
if (empty($_SESSION['USER'])) {
lib/weblib.php
+17 -10
View File
@@ -970,11 +970,15 @@ function print_header ($title="", $heading="", $navigation="", $focus="", $meta=
if (!empty($CFG->unicode)) {
$encoding = "utf-8";
} else if (!empty($SESSION->encoding) and empty($CFG->courselang)) {
$encoding = $SESSION->encoding;
} else {
} else if (!empty($CFG->courselang)) {
$encoding = get_string("thischarset");
$SESSION->encoding = $encoding;
moodle_setlocale();
} else {
if (!empty($SESSION->encoding)) {
$encoding = $SESSION->encoding;
} else {
$SESSION->encoding = $encoding = get_string("thischarset");
}
}
$meta = "<meta http-equiv=\"content-type\" content=\"text/html; charset=$encoding\" />\n$meta\n";
@@ -1866,7 +1870,7 @@ function navmenu($course, $cm=NULL, $targetwindow="self") {
$selectmod = $mod;
$backmod = $previousmod;
$flag = true; // set flag so we know to use next mod for "next"
$mod->name = get_string('jumpto');
$mod->name = $strjumpto;
$strjumpto = '';
} else {
$mod->name = strip_tags(urldecode($mod->name));
@@ -1948,19 +1952,22 @@ function print_time_selector($hour, $minute, $currenttime=0, $step=5) {
choose_from_menu($minutes, $minute, $currentdate['minutes'], "");
}
function print_timer_selector($timelimit = 0) {
function print_timer_selector($timelimit = 0, $unit = "") {
/// Prints time limit value selector
/// to add or edit quiz's time limit
global $CFG;
if ($unit) {
$unit = ' '.$unit;
}
// Max timelimit is sessiontimeout - 10 minutes.
$maxvalue = ($CFG->sessiontimeout / 60) - 10;
for ($i=0; $i<=$maxvalue; $i++) {
$minutes[$i] = sprintf("%02d",$i);
for ($i=1; $i<=$maxvalue; $i++) {
$minutes[$i] = $i.$unit;
}
choose_from_menu($minutes, "timelimit", $timelimit,"");
choose_from_menu($minutes, "timelimit", $timelimit, get_string("none"));
}
function print_grade_menu($courseid, $name, $current, $includenograde=true) {