Changeset 1082 in ExiteCMS for trunk/includes/locale_functions.php

Timestamp:

11/07/07 18:09:49 (5 years ago)

Author:

root

Message:

Added characterset and system locale information to the locales table
removed hardcoded dateformat and datesequence (locale info needs to be used)

File:

• trunk/includes/locale_functions.php (modified) (1 diff)

trunk/includes/locale_functions.php

@@ -58 +58 @@
 if (!defined('LOCALESET')) define("LOCALESET", $settings['locale']."/");
 
-// define the website server locale (if not defined)
-if (!isset($settings['unix_locale'])) $settings['unix_locale'] = "en_US";
-
-// set system locales
-setlocale(LC_TIME, $settings['unix_locale']); // *nix Server (TODO: Windows may differ)
-
-// define the website characterset (if not defined)
-if (!isset($settings['charset'])) $settings['charset'] = "iso-8859-1";
-
 // define the website location (country) (if not defined)
 if (!isset($settings['country'])) $settings['country'] = "??";
 
-// get the locale code, we need this in several places
+// get locales information, we need this in several places
 if (dbtable_exists($db_prefix."locale")) {
-    $result = dbquery("SELECT locale_code FROM ".$db_prefix."locale WHERE locale_name = '".$settings['locale']."'");
-    if ($dbrows($result)) {
+    $result = dbquery("SELECT * FROM ".$db_prefix."locale WHERE locale_name = '".$settings['locale']."'");
+    if (dbrows($result)) {
         $data = dbarray($result);
         $settings['locale_code'] = $data['locale_code'];
+        $settings['charset'] = $data['locale_charset'];
+        $settings['locales'] = $data['locale_locale'];
     }
 }
+// if we couldn't find it, use some default values
 if (!isset($settings['locale_code'])) $settings['locale_code'] = "en";
+if (!isset($settings['charset'])) $settings['charset'] = "iso-8859-1";
+if (!isset($settings['locales'])) $settings['locales'] = "en_US|en_GB|english|eng";
 
-// Date info (TODO: need to find a better solution for this)
-if (!isset($settings['dateformat'])) $settings['dateformat'] = "mm-dd-yyyy";
-if (!isset($settings['datesequence'])) $settings['datesequence'] = array("M", "D", "Y");
+// set the locale for strfime()
+setlocale(LC_TIME, explode("|", $settings['locales']));
 
 // Initialise the $locale array