From: gustav_delius <gustav_delius>
Date: Sun, 3 Sep 2006 11:38:45 +0000 (+0000)
Subject: The file countries.php does not exist in lang/en, only in lang/en_utf8. Therefore... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5b3df41fd9b7b24c45bf6fd63bb753fd5703f5e3;p=moodle.git

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.
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 6515274086..992cf453b2 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4508,12 +4508,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')) {
@@ -4521,10 +4515,10 @@ 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
         }
     }