|
From: Jon O. <jon...@us...> - 2007-09-12 19:28:30
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13225/includes Modified Files: mx_functions_style.php Log Message: for 2.9.x - updates Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_functions_style.php 9 Sep 2007 16:48:17 -0000 1.18 --- mx_functions_style.php 12 Sep 2007 19:28:26 -0000 1.19 *************** *** 613,617 **** $board_config['default_lang'] = $this->get_old_lang($this->lang['default_lang']); // ? ! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); // Also include phpBB lang keys include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); --- 613,617 ---- $board_config['default_lang'] = $this->get_old_lang($this->lang['default_lang']); // ? ! include($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); // Also include phpBB lang keys include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); *************** *** 623,627 **** } ! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); // Also include phpBB lang keys include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); } --- 623,627 ---- } ! include($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); // Also include phpBB lang keys include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); } *************** *** 1259,1262 **** --- 1259,1435 ---- } + // USE: $default_lang = $mx_user->get_old_lang($board_config['default_lang']); + function get_old_lang($lang) + { + if ( PORTAL_BACKEND != 'phpbb3' ) + { + return $lang; + } + + switch( $lang ) + { + case 'ar': + $default_lang = 'arabic'; + break; + case 'bg': + $default_lang = 'bulgarian'; + break; + case 'ca': + $default_lang = 'catalan'; + break; + case 'cs': + $default_lang = 'czech'; + break; + case 'da': + $default_lang = 'danish'; + break; + case 'de': + $default_lang = 'german'; + break; + case 'et': + $default_lang = 'estonian'; + break; + case 'en': + $default_lang = 'english'; + break; + case 'fi': + $default_lang = 'finnish'; + break; + case 'fr ': + $default_lang = 'french'; + break; + case 'el': + $default_lang = 'greek'; + break; + case 'es[_-]ar': + $default_lang = 'spanish_argentina'; + break; + case 'es([_-][a-z]+)?': + $default_lang = 'spanish'; + break; + case 'gd': + $default_lang = 'gaelic'; + break; + case 'gl': + $default_lang = 'galego'; + break; + case 'gu': + $default_lang = 'gujarati'; + break; + case 'he': + $default_lang = 'hebrew'; + break; + case 'hi': + $default_lang = 'hindi'; + break; + case 'is': + $default_lang = 'icelandic'; + break; + case 'id ': + $default_lang = 'indonesian'; + break; + case 'it': + $default_lang = 'italian'; + break; + case 'ja': + $default_lang = 'japanese'; + break; + case 'ko': + $default_lang = 'korean'; + break; + case 'lv': + $default_lang = 'latvian'; + break; + case 'mk': + $default_lang = 'macedonian'; + break; + case 'nl ': + $default_lang = 'dutch'; + break; + case 'no': + $default_lang = 'norwegian'; + break; + case 'pa': + $default_lang = 'punjabi'; + break; + case 'lt': + $default_lang = 'lithuanian'; + break; + case 'pl': + $default_lang = 'polish'; + break; + case 'pt[_-]br': + $default_lang = 'portuguese_brazil'; + break; + case 'pt ': + $default_lang = 'portuguese'; + break; + case 'ro': + $default_lang = 'romanian'; + break; + case 'sl': + $default_lang = 'slovenian'; + break; + case 'sr': + $default_lang = 'serbian'; + break; + case 'sv': + $default_lang = 'slovak'; + break; + case 'sw': + $default_lang = 'swedish'; + break; + case 'th': + $default_lang = 'thai'; + break; + case 'tr': + $default_lang = 'turkish'; + break; + case 'uk': + $default_lang = 'ukranian'; + break; + case 'ur': + $default_lang = 'urdu'; + break; + case 'vi': + $default_lang = 'viatnamese'; + break; + case 'zh': + $default_lang = 'chinese_simplified'; + break; + case 'zh[_-]tw': + $default_lang = 'chinese_traditional_taiwan'; + break; + case 'pl': + $default_lang = 'polish'; + break; + case 'pl': + $default_lang = 'polish'; + break; + case 'pl': + $default_lang = 'polish'; + break; + default: + $default_lang = $lang; + break; + } + + return $default_lang; + } + + /** + * Get option bit field from user options + */ + function optionget($key, $data = false) + { + if (!isset($this->keyvalues[$key])) + { + $var = ($data) ? $data : $this->data['user_options']; + $this->keyvalues[$key] = ($var & 1 << $this->keyoptions[$key]) ? true : false; + } + + return $this->keyvalues[$key]; + } + // ------------------------------ // Public Methods |