Changeset 1081 in ExiteCMS

Timestamp:

11/07/07 16:57:20 (4 years ago)

Author:

root

Message:

removed empty locale index files
moved some locale settings (charset, country, dateinfo) from $locale to $settings
updated the modules and templates that used these variables

Location:

trunk

Files:

• feeds.php (modified) (1 diff)
• files/locales/English.admin.index.php (deleted)
• files/locales/English.forum.index.php (deleted)
• files/locales/English.main.global.php (modified) (1 diff)
• files/locales/English.main.index.php (deleted)
• files/locales/English.main.setup.php (modified) (1 diff)
• forum/post.php (modified) (1 diff)
• forum/viewthread.php (modified) (1 diff)
• includes/locale_functions.php (modified) (1 diff)
• includes/sendmail_include.php (modified) (2 diffs)
• includes/template-plugins/modifier.escape.php (modified) (1 diff)
• includes/templates/main.edit_profile.tpl (modified) (1 diff)
• includes/templates/main.register.tpl (modified) (1 diff)
• includes/templates/main.setup.tpl (modified) (1 diff)
• includes/user_functions.php (modified) (1 diff)
• pm.php (modified) (2 diffs)
• setup.php (modified) (1 diff)
• themes/ExiteCMS/templates/templates/_header.tpl (modified) (3 diffs)

trunk/feeds.php

@@ -87 +87 @@
 
 // start building the XML file
-header("Content-type: text/xml; charset=".$locale['charset']);
-echo "<?xml version=\"1.0\" encoding=\"".$locale['charset']."\"?>\n";
+header("Content-type: text/xml; charset=".$settings['charset']);
+echo "<?xml version=\"1.0\" encoding=\"".$settings['charset']."\"?>\n";
 echo "<rss version=\"2.0\">\n";
 

trunk/files/locales/English.main.global.php

@@ -7 +7 @@
 */
 
-// Locale Settings
-setlocale(LC_TIME, "en_GB", "en","GB"); // Linux Server (Windows may differ)
-$locale['country'] = "GB";
-$locale['charset'] = "iso-8859-1";
-$locale['tinymce'] = "en";
-$locale['phpmailer'] = "en";
-
-// Full & Short Months, Date info
+// Full & Short Months
 $locale['months'] = "&nbsp|January|February|March|April|May|June|July|August|September|October|November|December";
 $locale['shortmonths'] = "&nbsp|Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sept|Oct|Nov|Dec";
-$locale['dateformat'] = "mm-dd-yyyy";
-$locale['datesequence'] = array("M", "D", "Y");
 
 // Standard User Levels

trunk/files/locales/English.main.setup.php

@@ -1 +1 @@
 <?php
 $locale['title'] = "ExiteCMS Setup";
-$locale['charset'] = "iso-8859-1";
+
 $locale['400'] = "Select your default locale";
 $locale['401'] = "Unable to establish database connection.<br><br>

trunk/forum/post.php

@@ -465 +465 @@
             if ($settings['forum_flags']) {
                 if ($userdata['user_id'] == 1) {
-                    $preview['cc_flag'] = GeoIP_Code2Flag($locale['country']);
+                    $preview['cc_flag'] = GeoIP_Code2Flag($settings['country']);
                 } else {
                     $preview['cc_flag'] = GeoIP_IP2Flag($userdata['user_ip']);

trunk/forum/viewthread.php

@@ -252 +252 @@
         if ($settings['forum_flags']) {
             if ($data['post_author'] == 1) {
-                $data['cc_flag'] = GeoIP_Code2Flag($locale['country']);
+                $data['cc_flag'] = GeoIP_Code2Flag($settings['country']);
             } else {
                 $data['cc_flag'] = GeoIP_IP2Flag($data['post_ip']);

trunk/includes/locale_functions.php

@@ -54 +54 @@
 }
 
-// locale defines
+// legacy locale defines
 define("PATH_LOCALE", PATH_ROOT."locale/");
 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
+if (dbtable_exists($db_prefix."locale")) {
+    $result = dbquery("SELECT locale_code FROM ".$db_prefix."locale WHERE locale_name = '".$settings['locale']."'");
+    if ($dbrows($result)) {
+        $data = dbarray($result);
+        $settings['locale_code'] = $data['locale_code'];
+    }
+}
+if (!isset($settings['locale_code'])) $settings['locale_code'] = "en";
+
+// 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");
 
 // Initialise the $locale array

trunk/includes/sendmail_include.php

@@ -19 +19 @@
     
     $mail = new PHPMailer();
-    if (file_exists(PATH_INCLUDES."languages/phpmailer.lang-".$locale['phpmailer'].".php")) {
-        $mail->SetLanguage($locale['phpmailer'], PATH_INCLUDES."language/");
+    if (file_exists(PATH_INCLUDES."languages/phpmailer.lang-".$settings['locale_code'].".php")) {
+        $mail->SetLanguage($settings['locale_code'], PATH_INCLUDES."language/");
     } else {
         $mail->SetLanguage("en", PATH_INCLUDES."language/");
@@ -36 +36 @@
     }
     
-    $mail->CharSet = $locale['charset'];
+    $mail->CharSet = $settings['charset'];
     $mail->From = $fromemail;
     $mail->FromName = $fromname;

trunk/includes/template-plugins/modifier.escape.php

@@ -22 +22 @@
 function smarty_modifier_escape($string, $esc_type = 'entities', $char_set = '')
 {
-    global $locale;
+    global $locale, $settings;
     
     // set a default char_set if none given
-    if ($char_set == '') $char_set = $locale['charset'];
+    if ($char_set == '') $char_set = $settings['charset'];
 
     switch ($esc_type) {

trunk/includes/templates/main.edit_profile.tpl

@@ -114 +114 @@
         <tr>
         <td class='tbl'>
-            {$locale.u010}
+            {$locale.u010} ( {$settings.dateformat} )
         </td>
             <td class='tbl'>
-                {foreach from=$locale.datesequence item=field}
+                {foreach from=$settings.datesequence item=field}
                 {if $field == "D"}
                 <select name='user_day' class='textbox'>

trunk/includes/templates/main.register.tpl

@@ -122 +122 @@
                 <td class='tbl'>
                     {$locale.u010}
-                    <span class='small2'>( mm/dd/yyyy )</span>
-                </td>
-                <td class='tbl'>
-                    {foreach from=$locale.datesequence item=field}
+                    <span class='small2'>( {$settings.dateformat} )</span>
+                </td>
+                <td class='tbl'>}
+                    {foreach from=$settings.datesequence item=field}
                     {if $field == "D"}
                     <select name='user_day' class='textbox'>

trunk/includes/templates/main.setup.tpl

@@ -19 +19 @@
 <head>
 <title>{$locale.title}</title>
-<meta http-equiv='Content-Type' content='text/html; charset={$locale.charset}'>
+<meta http-equiv='Content-Type' content='text/html; charset={$settings.charset}'>
 {literal}<style type="text/css">
 <!--

trunk/includes/user_functions.php

@@ -185 +185 @@
 // if logged in, update the users lastvisit time and country
 if (iMEMBER) {
-    $cc_code = $userdata['user_id'] == 1 ? $locale['country'] : GeoIP_IP2Code(USER_IP, true);
+    $cc_code = $userdata['user_id'] == 1 ? $settings['country'] : GeoIP_IP2Code(USER_IP, true);
     $result = dbquery("UPDATE ".$db_prefix."users SET user_lastvisit='".time()."', user_ip='".USER_IP."', user_cc_code='".$cc_code."' WHERE user_id='".$userdata['user_id']."'");
 }

trunk/pm.php

@@ -54 +54 @@
             // fix the webmaster to the site's country code
             if ($msgrec['pmindex_from_id'] == 1) {
-                $data2['cc_flag'] = GeoIP_Code2Flag($locale['country']);
+                $data2['cc_flag'] = GeoIP_Code2Flag($settings['country']);
             } else {
                 $data2['cc_flag'] = GeoIP_IP2Flag($data2['user_ip']);
@@ -83 +83 @@
                 // fix the webmaster to the site's country code
                 if ($msgrec['pmindex_to_id'] == 1) {
-                    $data2['cc_flag'] = GeoIP_Code2Flag($locale['country']);
+                    $data2['cc_flag'] = GeoIP_Code2Flag($settings['country']);
                 } else {
                     $data2['cc_flag'] = GeoIP_IP2Flag($data2['user_ip']);

trunk/setup.php

@@ -112 +112 @@
 $settings = array("locale" => (isset($_GET['localeset']) ? $_GET['localeset'] : "English"));
 $variables['localeset'] = $settings['locale'];
+$variables['charset'] = "iso-8859-1";
 
 // check if the cache directories are writeable

trunk/themes/ExiteCMS/templates/templates/_header.tpl

@@ -22 +22 @@
 <head>
     <title>{$settings.sitename}</title>
-    <meta http-equiv='Content-Type' content='text/html; charset={$locale.charset}' />
+    <meta http-equiv='Content-Type' content='text/html; charset={$settings.charset}' />
     <meta name='description' content='{$settings.description}' />
     <meta name='keywords' content='{$settings.keywords}' />
@@ -39 +39 @@
             editor_deselector:'textbox',
             theme:'advanced',
-            language:'en',
+            language:'{/literal}{$settings.locale_code}{literal}',
             entities:'60,lt,62,gt',
             document_base_url:'{/literal}{$settings.siteurl}{literal}',
@@ -67 +67 @@
             mode:'textareas',
             theme:'simple',
-            language:'en',
+            language:'{/literal}{$settings.locale_code}{literal}',
             convert_newlines_to_brs:'true',
             force_br_newlines:'true',