diff options
| -rw-r--r-- | BitLanguage.php | 6 | ||||
| -rw-r--r-- | admin/schema_inc.php | 8 | ||||
| -rw-r--r-- | admin/upgrade_inc.php | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/BitLanguage.php b/BitLanguage.php index df6c093..15a7d6d 100644 --- a/BitLanguage.php +++ b/BitLanguage.php @@ -14,7 +14,7 @@ // +----------------------------------------------------------------------+ // | Authors: spider <spider@steelsun.com> // +----------------------------------------------------------------------+ -// $Id: BitLanguage.php,v 1.4 2005/07/17 17:36:07 squareing Exp $ +// $Id: BitLanguage.php,v 1.5 2005/07/25 20:02:11 squareing Exp $ class BitLanguage extends BitBase { // list of available (non-disabled) languages @@ -370,10 +370,10 @@ class BitLanguage extends BitBase { $sourceHash = $this->getSourceHash( $pString ); $query = "SELECT `tran`, tivm.`version`, tivm.`source_hash` AS `usage_source_hash` FROM `".BIT_DB_PREFIX."tiki_i18n_masters` tim - LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_i18n_strings` tis ON( tim.`source_hash`=tis.`source_hash` AND `lang_code`=? ) LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_i18n_version_map` tivm ON( tivm.`source_hash`=tim.`source_hash` AND tivm.`version`=? ) + LEFT OUTER JOIN `".BIT_DB_PREFIX."tiki_i18n_strings` tis ON( tim.`source_hash`=tis.`source_hash` AND `lang_code`=? ) WHERE tim.`source_hash`=?"; - $ret = $this->mDb->GetRow($query, array( $pLangCode, BIT_MAJOR_VERSION , $sourceHash ) ); + $ret = $this->mDb->GetRow($query, array( BIT_MAJOR_VERSION, $pLangCode, $sourceHash ) ); if( $pOverrideUsage && $gBitSystem->isFeatureActive( 'record_untranslated' ) ) { $query = "SELECT `source_hash` FROM `".BIT_DB_PREFIX."tiki_i18n_masters` WHERE `source_hash`=?"; $source = $this->GetOne($query, array( $this->getSourceHash( $pString ) ) ); diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 21fa9c6..8fca18c 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -20,12 +20,12 @@ $tables = array( source_hash C(32) PRIMARY, lang_code C(32) PRIMARY, last_modified I8 NOTNULL, - tran X NOTNULL + `tran` X NOTNULL ", 'tiki_i18n_version_map' => " source_hash C(32) PRIMARY, - version C(32) + version C(32) PRIMARY " ); @@ -101,11 +101,11 @@ $gBitInstaller->registerSchemaDefault( LANGUAGES_PKG_NAME, array( "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('tr', 'Turkish', 'Türkçe' )", "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('tv', 'Tuvaluan', NULL )", "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('uk', 'Українська', 'Ukrainian')", - "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('zh', 'Chinese', 'Chinese')", + "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('zh-cn', 'Chinese', 'Chinese')", "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('ca', 'Catalan', 'Catalan')", ) ); -// lang file is not UTF-8 'cn' => array( '中文(簡体字)', tra("Simplified Chinese')", +// lang file is not UTF-8 'zh-cn' => array( '中文(簡体字)', tra("Simplified Chinese')", // lang file is not UTF-8 'he' => array( 'Hebrew', tra("Hebrew')", ?> diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 7a34a2b..fcbb80d 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -83,7 +83,7 @@ array( 'QUERY' => "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('tw', '中文(繁体字)', 'Traditional Chinese')", "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('tv', 'Tuvaluan', NULL )", "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('uk', 'Українська', 'Ukrainian')", - "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('zh', 'Chinese', 'Chinese')", + "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('zh-cn', 'Chinese', 'Chinese')", "INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('ca', 'Catalan', 'Catalan')", )), ), |