Changeset 15664 for trunk/install

Timestamp:

11/08/11 02:19:15 (7 months ago)

Author:

Anton Lesnikov

Message:

1.Language file rebuilding.

1. XML based language files.
2. Move languages in Modules.
3. Install language files in "installed" and "will be installed" modules.
4. Allow to select only installed and enabled languages.

2. Related updates in Templates.

Location:

trunk/install

Files:

• index.php (modified) (1 diff)
• langs (deleted)
• sql/v70.sql (modified) (5 diffs)

trunk/install/index.php

@@ -114 +114 @@
 define('BX_SYSTEM_COMPOSITE', '%dir_composite%');
 define('BX_SYSTEM_PHPBIN', '%dir_php%');
+
+define('BX_DOL_DIR_RIGHTS', 0777);
+define('BX_DOL_FILE_RIGHTS', 0666);
 
 //--- Module types ---//

trunk/install/sql/v70.sql

@@ -1240 +1240 @@
 
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
-(@iCategoryId, 'lang_default', 'Default Language', 'en', 'select', 'PHP:bx_import(''BxDolLanguagesQuery''); $aValues = BxDolLanguagesQuery::getInstance()->getLanguages(); $aResult = array(); foreach($aValues as $sKey => $sValue) $aResult[] = array(\'key\' => $sKey, \'value\' => $sValue); return $aResult;', '', '', 1),
+(@iCategoryId, 'lang_default', 'Default Language', '', 'select', 'PHP:$aValues = getLanguages(false, true); $aResult = array(); foreach($aValues as $sKey => $sValue) $aResult[] = array(\'key\' => $sKey, \'value\' => $sValue); return $aResult;', '', '', 1),
 (@iCategoryId, 'lang_selector', 'Show Language Selector', 'on', 'checkbox', '', '', '', 2);
 
@@ -1249 +1249 @@
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
 (@iCategoryId, 'site_title', 'Site Name', 'Unite Community', 'digit', '', '', '', 1),
-(@iCategoryId, 'template', 'Default Template', 'uni', 'select', 'PHP:$aValues = get_templates_array(); $aResult = array(); foreach($aValues as $sKey => $sValue) $aResult[] = array(\'key\' => $sKey, \'value\' => $sValue); return $aResult;', 'return (strlen($arg0) > 0 && file_exists(BX_DIRECTORY_PATH_ROOT . "templates/tmpl_" . $arg0)) ? true : false;', 'Template cannot be empty and must have a valid name.', 2),
+(@iCategoryId, 'template', 'Default Template', '', 'select', 'PHP:$aValues = get_templates_array(); $aResult = array(); foreach($aValues as $sKey => $sValue) $aResult[] = array(\'key\' => $sKey, \'value\' => $sValue); return $aResult;', 'return (strlen($arg0) > 0 && file_exists(BX_DIRECTORY_PATH_ROOT . "templates/tmpl_" . $arg0)) ? true : false;', 'Template cannot be empty and must have a valid name.', 2),
 (@iCategoryId, 'enable_template', 'Show Template Switcher', 'on', 'checkbox', '', '', '', 3),
 (@iCategoryId, 'sys_template_cache_enable', 'Enable cache for HTML files', '', 'checkbox', '', '', '', 4),
@@ -1368 +1368 @@
   `Flag` varchar(2) NOT NULL default '',
   `Title` varchar(255) NOT NULL default '',
+  `Enabled` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (`ID`),
   UNIQUE KEY `Name` (`Name`)
@@ -4782 +4783 @@
 
 INSERT INTO `sys_std_pages`(`index`, `name`, `header`, `caption`, `icon`) VALUES
-(3, 'language_en', '', '', 'pi-lang-en.png');
-SET @iIdLanguageEn = LAST_INSERT_ID();
-
-INSERT INTO `sys_std_pages`(`index`, `name`, `header`, `caption`, `icon`) VALUES
 (3, 'builder_pages', '_adm_page_cpt_builder_pages', '_adm_page_cpt_builder_pages', 'pi-builder-pages.png');
 SET @iIdBuilderPages = LAST_INSERT_ID();
@@ -4848 +4845 @@
 INSERT INTO `sys_std_pages_widgets`(`page_id`, `widget_id`, `order`) VALUES(@iIdLanguages, LAST_INSERT_ID(), 1);
 
-INSERT INTO `sys_std_widgets`(`page_id`, `url`, `click`, `icon`, `caption`, `cnt_notices`, `cnt_actions`, `status`) VALUES
-(@iIdLanguageEn, '{url_studio}languages.php?name=en', '', 'wi-lang-english.png', '_adm_wgt_cpt_language_en', '', '', 1);
-INSERT INTO `sys_std_pages_widgets`(`page_id`, `widget_id`, `order`) VALUES(@iIdLanguages, LAST_INSERT_ID(), 1);
-
 --
 -- Builders Page