Use lang if locale not defined

diff --git a/lib/setup.php b/lib/setup.php
index de7fb492587afe71e996752a22f039e6ee86fde8..47f95a7ec81afc6f1cd2cbe0ea8a960efaeb2d22 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -36,7 +36,11 @@
 
 // Set language/locale of printed times (must be supported by OS)
 
-    setlocale ("LC_TIME", $CFG->locale);
+    if ($CFG->locale) {
+        setlocale ("LC_TIME", $CFG->locale);
+    } else {
+        setlocale ("LC_TIME", $CFG->lang);
+    }
 
 // Load up theme variables (colours etc)