Changeset 1071 in ExiteCMS for trunk/setup.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/setup.php (modified) (5 diffs)

trunk/setup.php

@@ -85 +85 @@
 define("PATH_ADMIN", PATH_ROOT."administration/");
 define("PATH_THEMES", PATH_ROOT."themes/");
-define("PATH_THEME", PATH_ROOT."themes/PLiTheme/");
-define("PATH_LOCALE", PATH_ROOT."locale/");
+define("PATH_THEME", PATH_ROOT."themes/ExiteCMS/");
 define("PATH_PHOTOS", PATH_ROOT."images/photoalbum/");
 define("PATH_IMAGES", PATH_ROOT."images/");
@@ -97 +96 @@
 define("PATH_INCLUDES", PATH_ROOT."includes/");
 define("PATH_MODULES", PATH_ROOT."modules/");
-define("PATH_ATTACHMENTS", PATH_ROOT."files/");
+define("PATH_ATTACHMENTS", PATH_ROOT."files/attachments");
 
 define("FUSION_SELF", isset($_SERVER['REDIRECT_URL']) && $_SERVER['REDIRECT_URL'] != "" ? basename($_SERVER['REDIRECT_URL']) : basename($_SERVER['PHP_SELF']));
@@ -111 +110 @@
 $step = (isset($_GET['step']) ? $_GET['step'] : "0");
 $variables['step'] = $step;
-$localeset = (isset($_GET['localeset']) ? $_GET['localeset'] : "English");
-$variables['localeset'] = $localeset;
-define("LOCALESET", $localeset.'/');
+$settings = array("locale" => (isset($_GET['localeset']) ? $_GET['localeset'] : "English"));
+$variables['localeset'] = $settings['locale'];
 
 // check if the cache directories are writeable
@@ -156 +154 @@
 
 require_once PATH_ROOT."includes/theme_functions.php";
+require_once PATH_ROOT."includes/locale_functions.php";
 
 // load the locale for this module
-include PATH_LOCALE.$localeset."/setup.php";
+locale_load("main.setup");
 
 // process the different setup steps
@@ -392 +391 @@
 
 // define the setup body panel variables
-$template_panels[] = array('type' => 'body', 'name' => 'setup', 'template' => 'main.setup.tpl', 'locale' => PATH_LOCALE.$localeset."/setup.php");
+$template_panels[] = array('type' => 'body', 'name' => 'setup', 'template' => 'main.setup.tpl', 'locale' => "main.setup");
 $template_variables['setup'] = $variables;