From bcaf494ee9eaf090cc88017ff59d588de46615f1 Mon Sep 17 00:00:00 2001 From: nanosimbiot Date: Tue, 2 Aug 2011 23:34:34 +0000 Subject: [PATCH] r189 lang git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@189 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 4 ++-- upload/images/folder.gif | Bin 0 -> 372 bytes upload/images/page.gif | Bin 0 -> 582 bytes upload/includes/cron/jobs/avatars_cleanup.php | 2 +- upload/includes/cron/jobs/bb_maintenance.php | 2 +- upload/includes/page_footer.php | 12 ++++++------ upload/includes/page_footer_dev.php | 2 +- upload/language/lang_english/lang_main.php | 10 +++++++++- upload/language/lang_russian/lang_main.php | 11 ++++++++++- 9 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 upload/images/folder.gif create mode 100644 upload/images/page.gif diff --git a/upload/config.php b/upload/config.php index d444a6a1f..a13d3c5f2 100644 --- a/upload/config.php +++ b/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Попробуйте повторить запрос через несколько минут"; diff --git a/upload/images/folder.gif b/upload/images/folder.gif new file mode 100644 index 0000000000000000000000000000000000000000..eb129763dcea0dc1916b7e934fdce2fd8770c380 GIT binary patch literal 372 zcmZ?wbhEHb6k-r!xXQrr`}gnn@893v9&~1=$&)8f4jw$XxRCo$zt;Bc+vnx5?P^z= zlf`m!n&I9q)y<94Gt(JwZ!g^1B)cGw zMSgXq@QJAg2YNM*9XqzJMr>9F(~2^IHB}=2ujK##G5PiD*Z=>|`G33g|C9Rv?>o0` z+x8y>W-^ck6o0ZXGBD^d=zw&C{KUXE(P4UlhmKVLi6xgzC4402GB{W!L~2f9POOq~ zU`a4ovhaqB%+vz~Nx8dkFFrrvqSej!Kd!MF9@+A*p|PG#+gVIkwX>^RSE$vAT~}-J zl&QL${d#h`nsevP*X5qctE;hW`3hadnOwRm>o;uF<*#vKOczy ZVbwl)>NG2h3j?FtrOQ`>yuBP5tO0@?i&Ovr literal 0 HcmV?d00001 diff --git a/upload/images/page.gif b/upload/images/page.gif new file mode 100644 index 0000000000000000000000000000000000000000..42d7318c5d928a2033cb42c72598a131ea6de64d GIT binary patch literal 582 zcmZ?wbhEHb6k-r!c*el+`}gnn@8AFU{r~N^{|65qeDdVU-@kuvy#9aS{{Mgf|9}4Z z|M0{AU%q_(`SWMv)Wg{&OV2(3AD1{GbotxKt1eYFZ#Zz^|ILSQTV|i?T5|Ba{La?4kwX3c6}c&WZ`PygnpJ?rkDyZry# zum9<}^Zxw(U)#BD%KlHsjvf2=@89j`-!lsq`N~Rn2+cXw3F)`cNXo|{M zwn^yh*lA;L&u+56RaJ{?r=8t#bK_Gj;^%BG95Yu?zS_*U>z2K_g$4ipCbgRvpFHC> zdg-Vu`PTd?H;48ok#7ReIGiR-xW0J7!Dc}Y2`z_&_QUOboFWD+3JrbT68dFMM=k~^ HFjxZso}Jb2 literal 0 HcmV?d00001 diff --git a/upload/includes/cron/jobs/avatars_cleanup.php b/upload/includes/cron/jobs/avatars_cleanup.php index 36d0d00a7..3b7cfbed1 100644 --- a/upload/includes/cron/jobs/avatars_cleanup.php +++ b/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))"); diff --git a/upload/includes/cron/jobs/bb_maintenance.php b/upload/includes/cron/jobs/bb_maintenance.php index ddef11ba5..cee9fa4f6 100644 --- a/upload/includes/cron/jobs/bb_maintenance.php +++ b/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 diff --git a/upload/includes/page_footer.php b/upload/includes/page_footer.php index eb874db34..8c3db5e41 100644 --- a/upload/includes/page_footer.php +++ b/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' : 'GZIP'; - $gzip_text .= ($bb_cfg['gzip_compress']) ? ' ON' : ' OFF'; + $gzip_text = (UA_GZIP_SUPPORTED) ? 'GZIP ' : 'GZIP '; + $gzip_text .= ($bb_cfg['gzip_compress']) ? $lang['ON'] : $lang['OFF']; $debug_text = (DEBUG) ? 'Debug ON' : 'Debug OFF'; $stat = '[  '; - $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%%) · ', $sql_t, round($sql_t*100/$gen_time)) : ''; $num_q = $DBS->num_queries; - $stat .= "  |  MySQL: {$sql_time_txt}{$num_q} queries"; + $stat .= "  |  MySQL: {$sql_time_txt}{$num_q} " . $lang['QUERIES']; } $stat .= "  |  $gzip_text"; - $stat .= '  |  Mem: '; + $stat .= '  |  '.$lang['MEMORY']; $stat .= humn_size($bb_cfg['mem_on_start'], 2) .' / '; $stat .= humn_size(sys('mem_peak'), 2) .' / '; $stat .= humn_size(sys('mem'), 2); diff --git a/upload/includes/page_footer_dev.php b/upload/includes/page_footer_dev.php index d23d54fd2..945b3660e 100644 --- a/upload/includes/page_footer_dev.php +++ b/upload/includes/page_footer_dev.php @@ -115,7 +115,7 @@ echo '
-'. ($sql_log ? $sql_log : 'sql_log') .' +'. ($sql_log ? $sql_log : '') .' '. (UA_IE ? '
' : '') .'
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 096509e70..3d746f713 100644 --- a/upload/language/lang_english/lang_main.php +++ b/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'; \ No newline at end of file +$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'; \ No newline at end of file diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 88017102c..0b21e73ee 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/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'] = 'Извините, эта функция временно не работает'; \ No newline at end of file +$lang['EMAILER_DISABLED'] = 'Извините, эта функция временно не работает'; + +// Debug +$lang['EXECUTION_TIME'] = 'Время выполнения:'; +$lang['SEC'] = 'сек'; +$lang['ON'] = 'вкл'; +$lang['OFF'] = 'выкл'; +$lang['MEMORY'] = 'Память: '; +$lang['QUERIES'] = 'запр.'; +