r189

lang git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@189 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

upload/config.php

@@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.0.2';
-$bb_cfg['tp_release_state'] = 'TP II r188';
-$bb_cfg['tp_release_date'] = '2-08-2011';
+$bb_cfg['tp_release_state'] = 'TP II r189';
+$bb_cfg['tp_release_date'] = '3-08-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
 $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";

upload/includes/cron/jobs/avatars_cleanup.php

@@ -16,7 +16,7 @@ DB()->query("
 	CREATE TEMPORARY TABLE $tmp_tbl (
 		user_avatar VARCHAR(255) NOT NULL default '',
 		KEY user_avatar (user_avatar(20))
-	) ENGINE = MyISAM
+	) ENGINE = MyISAM DEFAULT CHARSET = utf8
 ");
 
 DB()->query("ALTER TABLE ". BB_USERS ." ADD INDEX user_avatar(user_avatar(10))");

upload/includes/cron/jobs/bb_maintenance.php

@@ -32,7 +32,7 @@ DB()->query("
 	CREATE TEMPORARY TABLE $tmp_attach_tbl (
 		physical_filename VARCHAR(255) NOT NULL default '',
 		KEY physical_filename (physical_filename(20))
-	) ENGINE = MyISAM
+	) ENGINE = MyISAM DEFAULT CHARSET = utf8
 ");
 
 // Get attach_mod config

upload/includes/page_footer.php

@@ -30,24 +30,24 @@ if ($show_dbg_info)
 {
 	$gen_time = utime() - TIMESTART;
 	$gen_time_txt = sprintf('%.3f', $gen_time);
-	$gzip_text = (UA_GZIP_SUPPORTED) ? 'GZIP' : '<s>GZIP</s>';
-	$gzip_text .= ($bb_cfg['gzip_compress']) ? ' ON' : ' OFF';
+	$gzip_text = (UA_GZIP_SUPPORTED) ? 'GZIP ' : '<s>GZIP</s> ';
+	$gzip_text .= ($bb_cfg['gzip_compress']) ? $lang['ON'] : $lang['OFF'];
 	$debug_text = (DEBUG) ? 'Debug ON' : 'Debug OFF';
 
 	$stat = '[&nbsp; ';
-	$stat .= "Execution time: $gen_time_txt sec ";
+	$stat .= "".$lang['EXECUTION_TIME'] ." $gen_time_txt ".$lang['SEC'];
 
 	if (!empty($DBS))
 	{
 		$sql_t = $DBS->sql_timetotal;
-		$sql_time_txt = ($sql_t) ? sprintf('%.3f sec (%d%%) in ', $sql_t, round($sql_t*100/$gen_time)) : '';
+		$sql_time_txt = ($sql_t) ? sprintf('%.3f '.$lang['SEC'].' (%d%%) &middot; ', $sql_t, round($sql_t*100/$gen_time)) : '';
 		$num_q = $DBS->num_queries;
-		$stat .= " &nbsp;|&nbsp; MySQL: {$sql_time_txt}{$num_q} queries";
+		$stat .= " &nbsp;|&nbsp; MySQL: {$sql_time_txt}{$num_q} " . $lang['QUERIES'];
 	}
 
 	$stat .= " &nbsp;|&nbsp; $gzip_text";
 
-	$stat .= ' &nbsp;|&nbsp; Mem: ';
+	$stat .= ' &nbsp;|&nbsp; '.$lang['MEMORY'];
 	$stat .= humn_size($bb_cfg['mem_on_start'], 2) .' / ';
 	$stat .= humn_size(sys('mem_peak'), 2) .' / ';
 	$stat .= humn_size(sys('mem'), 2);

upload/includes/page_footer_dev.php

@@ -115,7 +115,7 @@ echo '
 </div><!-- / sqlLogHead -->
 
 <div class="sqlLog" id="sqlLog">
-'. ($sql_log ? $sql_log : 'sql_log') .'
+'. ($sql_log ? $sql_log : '') .'
 '. (UA_IE ? '<br />' : '') .'
 </div><!-- / sqlLog -->
 

upload/language/lang_english/lang_main.php

@@ -1569,4 +1569,12 @@ $lang['CHOOSE_PASS'] = 'Field for the password must not be empty!';
 $lang['CHOOSE_PASS_ERR'] = 'Entered passwords do not match';
 $lang['CHOOSE_PASS_OK'] = 'Passwords match, you can proceed with the registration.';
 
-$lang['EMAILER_DISABLED'] = 'Sorry, this feature is temporarily not working';
+$lang['EMAILER_DISABLED'] = 'Sorry, this feature is temporarily not working';
+
+// Debug
+$lang['EXECUTION_TIME'] = 'Execution time:';
+$lang['SEC'] = 'sec';
+$lang['ON'] = 'on';
+$lang['OFF'] = 'off';
+$lang['MEMORY'] = 'Mem: ';
+$lang['QUERIES'] = 'queries';

upload/language/lang_russian/lang_main.php

@@ -1583,4 +1583,13 @@ $lang['CHOOSE_PASS_ERR_20'] = 'Пароль должен быть не длин
 $lang['CHOOSE_PASS_OK'] = 'Пароли совпадают, можете продолжить регистрацию.';
 $lang['CHOOSE_PASS_FAILED'] = 'Для изменения пароля вы должны правильно указать текущий пароль';
 
-$lang['EMAILER_DISABLED'] = 'Извините, эта функция временно не работает';
+$lang['EMAILER_DISABLED'] = 'Извините, эта функция временно не работает';
+
+// Debug
+$lang['EXECUTION_TIME'] = 'Время выполнения:';
+$lang['SEC'] = 'сек';
+$lang['ON'] = 'вкл';
+$lang['OFF'] = 'выкл';
+$lang['MEMORY'] = 'Память: ';
+$lang['QUERIES'] = 'запр.';
+