Changeset 1071 in ExiteCMS for trunk/includes/theme_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/theme_functions.php (modified) (4 diffs)

trunk/includes/theme_functions.php

@@ -162 +162 @@
 +-----------------------------------------------------*/
 function load_templates($_type='', $_name='') {
-    global $settings, $userdata, $db_prefix, $aidlink,
+    global $settings, $locale, $userdata, $db_prefix, $aidlink,
             $template, $template_panels, $template_variables, 
             $_loadstats, $_headparms, $_bodyparms, $_last_updated;
 
+    // store the current locales. We need to restore them later
+    $current_locale = $locale;
+    
     // reset all assigned template variables
     $template->clear_all_assign();
@@ -173 +176 @@
     
     // Load the global language file
-    include PATH_LOCALE.LOCALESET."global.php";
+    locale_load("main.global");
 
     // assign CMS website settings to the template
@@ -223 +226 @@
 
             // if one or more locales are assigned to this panel, load them first
-            if (isset($panel['locale']) && (is_array($panel['locale']) || $panel['locale'] != "")) {
+            if (isset($panel['locale']) {
                 if (is_array($panel['locale'])) {
                     foreach($panel['locale'] as $panel_locale) {
-                        include $panel_locale;
+                        locale_load($panel_locale);
                     }
                 } else {
-                    include $panel['locale'];
+                    locale_load($panel['locale']);
                 }
             }
@@ -286 +289 @@
         }
     }
+
+    // restore the current locales.
+    $locale = $current_locale;
 }