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

Timestamp:

11/06/07 17:12:56 (5 years ago)

Author:

root

Message:

Replaced all includes of locales file by a call to locale_load()
Replaced all locale file references in templates by the locale name
Updated the theme functions to call locale_load() for template locales

File:

• trunk/includes/locale_functions.php (modified) (5 diffs)

trunk/includes/locale_functions.php

@@ -54 +54 @@
 }
 
-// locale defines (no longer needed once we moved to the new locale system!)
-
+// locale defines
 define("PATH_LOCALE", PATH_ROOT."locale/");
-
-// locale detection - step 3 - use the website's default
-if (!defined('LOCALESET')) {
-    define("LOCALESET", $settings['locale']."/");
-}
+if (!defined('LOCALESET')) define("LOCALESET", $settings['locale']."/");
 
 // Initialise the $locale array
@@ -75 +70 @@
 
     global $settings, $locale;
-    
+
     // assemble the locale filename
-    $locales_file = PATH_ROOT."files/".$locale['locale'].".".$locale_name.".php";
+    $locales_file = PATH_ROOT."files/locales/".$locale['locale'].".".$locale_name.".php";
 
     // check if we need to recompile from the database
@@ -109 +104 @@
                     fwrite($handle, "?>"."\n");
                     fclose($handle);
+                } else {
+                    trigger_error("ExiteCMS locales error: no write access to ".$locales_file."!", E_USER_ERROR);
                 }
             }
@@ -127 +124 @@
                 break;
 
+            case "forum":   // forum modules
+                $locales_file = PATH_LOCALE.$settings['locale']."/forum/".$nameparts[1].".php";
+                break;
+
             case "main":    // main modules
                 $locales_file = PATH_LOCALE.$settings['locale']."/".$nameparts[1].".php";
@@ -141 +142 @@
             default:
                 // unknown module type
+                trigger_error("ExiteCMS locales error: unknown or invalid module type specified in ".$locale_name."!", E_USER_ERROR);
         }       
     }
     
-    // if a locales file could be assembled, and it exists, load it
-    if (!empty($locales_file) && file_exists($locales_file)) {
-        include $locales_file;
+    // if a locales file could be assembled...
+    if (!empty($locales_file)) {
+        if (file_exists($locales_file)) {
+            // and it exists, load it
+            require_once $locales_file;
+        } else {
+            // otherwise, if the locale is not English, try to load the English version
+            if ($settings['locale'] != "English") {
+                $current_locale = $settings['locale'];
+                $settings['locale'] = "English";
+                locale_load($locale_name);
+                $settings['locale'] = $current_locale;
+            } else {
+                trigger_error("ExiteCMS locales error: unable to locate a locale for ".$locale_name."!", E_USER_ERROR);
+            }
+        }
     }