------------------------------------------------------------ revno: 932 committer: Roger Martin <[email protected]> branch nick: aikiframework timestamp: Sat 2011-11-12 21:50:56 +0100 message: lang columns use iso 639-1 modified: src/sql/CreateTables.sql src/sql/InsertDefaults.sql
-- lp:aikiframework https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk Your team Aiki Framework Developers is subscribed to branch lp:aikiframework. To unsubscribe from this branch go to https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'src/sql/CreateTables.sql' --- src/sql/CreateTables.sql 2011-11-10 21:42:11 +0000 +++ src/sql/CreateTables.sql 2011-11-12 20:50:56 +0000 @@ -29,7 +29,7 @@ config_type varchar(255) default NULL, config_data mediumtext, PRIMARY KEY (config_id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -42,7 +42,7 @@ setting_autoload int(11) NOT NULL, PRIMARY KEY (setting_id), KEY setting_name (setting_name) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -57,7 +57,7 @@ KEY config_name (config_name), KEY config_important (config_important), KEY config_weight (config_weight) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -65,12 +65,12 @@ term_id int(11) NOT NULL AUTO_INCREMENT, app_id int(11) NOT NULL, short_term varchar(255) NOT NULL, - lang_english text NOT NULL, - lang_arabic text NOT NULL, - lang_german text NOT NULL, - lang_chinese text NOT NULL, + lang_en text NOT NULL, + lang_ar text NOT NULL, + lang_de text NOT NULL, + lang_zh text NOT NULL, PRIMARY KEY (term_id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -86,7 +86,7 @@ form_html text NOT NULL, form_query text NOT NULL, PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -97,7 +97,7 @@ widgetid int(11) NOT NULL, timestarted timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -109,7 +109,7 @@ date varchar(255) NOT NULL, username varchar(255) NOT NULL, PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -126,7 +126,7 @@ extrasql varchar(255) NOT NULL default '', is_extrasql_loop int(1) NOT NULL, PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8 ROW_FORMAT=DYNAMIC; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ------------------------------------------------------ @@ -139,7 +139,7 @@ align varchar(10) NOT NULL, is_default int(1) NOT NULL default '0', PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -163,7 +163,7 @@ hits int(11) NOT NULL, PRIMARY KEY (id), UNIQUE KEY url (url) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -180,7 +180,7 @@ PRIMARY KEY (view_id), KEY view_prefix (view_prefix), KEY view_site (view_site) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -226,7 +226,7 @@ site_default_view varchar(32) NOT NULL, PRIMARY KEY (site_id), KEY site_prefix (site_prefix) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -238,7 +238,7 @@ template_output text NOT NULL, PRIMARY KEY (id), KEY template_name (template_name) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -252,7 +252,7 @@ username varchar(255) NOT NULL, revision int(11) NOT NULL, PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -279,7 +279,7 @@ is_active int(5) NOT NULL default '1', PRIMARY KEY (userid), UNIQUE KEY username (username) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -290,7 +290,7 @@ group_permissions varchar(255) NOT NULL, group_level int(11) NOT NULL, PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -305,7 +305,7 @@ user_ip varchar(100) NOT NULL, last_ip varchar(100) NOT NULL, PRIMARY KEY (session_id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -314,7 +314,7 @@ session_data varchar(255) NOT NULL, session_time int(11) NOT NULL, PRIMARY KEY (session_id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -352,7 +352,7 @@ widget_owner int(9) unsigned NOT NULL default '2', widget_privilege varchar(1) NOT NULL default 'w', PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- ------------------------------------------------------ @@ -405,7 +405,7 @@ filename varchar(255) NOT NULL, is_missing int(1) NOT NULL, PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8 ROW_FORMAT=DYNAMIC; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ------------------------------------------------------ @@ -425,7 +425,7 @@ PRIMARY KEY (id), FULLTEXT KEY title (title), FULLTEXT KEY text (text) -) ENGINE=MyISAM CHARSET=utf8 ROW_FORMAT=DYNAMIC; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; -- ------------------------------------------------------ @@ -439,4 +439,4 @@ db_encoding varchar(255) NOT NULL, db_use_mysql_set_charset varchar(255) NOT NULL, PRIMARY KEY (id) -) ENGINE=MyISAM CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8;; === modified file 'src/sql/InsertDefaults.sql' --- src/sql/InsertDefaults.sql 2011-11-08 13:42:45 +0000 +++ src/sql/InsertDefaults.sql 2011-11-12 20:50:56 +0000 @@ -23,7 +23,7 @@ * For more info see SQL_DELIMIT in libs/installer.php. */ -INSERT IGNORE INTO `aiki_dictionary` (`term_id`, `app_id`, `short_term`, `lang_english`, `lang_arabic`, `lang_german`, `lang_chinese`) VALUES +INSERT IGNORE INTO `aiki_dictionary` (`term_id`, `app_id`, `short_term`, `lang_en`, `lang_ar`, `lang_de`, `lang_zh`) VALUES (1, 0, 'encoding', 'utf-8', 'utf-8', 'utf-8', ''), (2, 0, 'added_successfully', 'Added successfully', '', '', ''), (3, 0, 'error_inserting_into_database', 'Error inserting into database', '', '', ''),
_______________________________________________ Mailing list: https://launchpad.net/~aikiframework-devel Post to : [email protected] Unsubscribe : https://launchpad.net/~aikiframework-devel More help : https://help.launchpad.net/ListHelp
