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

The file countries.php does not exist in lang/en, only in lang/en_utf8. Therefore the fallback default in the function get_list_of_countries() should always be en_utf8.

Browse Source
This commit is contained in:
gustav_delius
2006-09-03 11:39:54 +00:00
parent 6a2f9ca922
commit 4508fdd282
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+2 -9
View File
@@ -5091,12 +5091,6 @@ function get_list_of_countries() {
$lang = current_language();
if (!empty($CFG->unicodedb)) {
$defaultlang = 'en_utf8';
} else {
$defaultlang = 'en';
}
if (!file_exists($CFG->dirroot .'/lang/'. $lang .'/countries.php') &&
!file_exists($CFG->dataroot.'/lang/'. $lang .'/countries.php')) {
if ($parentlang = get_string('parentlanguage')) {
@@ -5104,14 +5098,13 @@ function get_list_of_countries() {
file_exists($CFG->dataroot.'/lang/'. $parentlang .'/countries.php')) {
$lang = $parentlang;
} else {
$lang = $defaultlang; // countries.php must exist in this pack
$lang = 'en_utf8'; // countries.php must exist in this pack
}
} else {
$lang = $defaultlang; // countries.php must exist in this pack
$lang = 'en_utf8'; // countries.php must exist in this pack
}
}
$string = array();
if (file_exists($CFG->dataroot .'/lang/'. $lang .'/countries.php')) {
include($CFG->dataroot .'/lang/'. $lang .'/countries.php');
} else if (file_exists($CFG->dirroot .'/lang/'. $lang .'/countries.php')) {