diff --git a/upload/ajax/posts.php b/upload/ajax/posts.php index 86321b9de..ff495c9fe 100644 --- a/upload/ajax/posts.php +++ b/upload/ajax/posts.php @@ -186,7 +186,7 @@ switch($this->request['type'])   - +     diff --git a/upload/config.php b/upload/config.php index 2d27e277c..4f1c37a9a 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Stable'; -$bb_cfg['tp_release_state'] = 'R244'; +$bb_cfg['tp_release_state'] = 'R245'; $bb_cfg['tp_release_date'] = '22-08-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger diff --git a/upload/includes/functions_torrent.php b/upload/includes/functions_torrent.php index b488f74b1..82793a5e5 100644 --- a/upload/includes/functions_torrent.php +++ b/upload/includes/functions_torrent.php @@ -29,7 +29,7 @@ function get_torrent_info ($attach_id) if (!$torrent = DB()->fetch_row($sql)) { - message_die(GENERAL_ERROR, 'Invalid attach_id'); + message_die(GENERAL_ERROR, $lang['INVALID_ATTACH_ID']); } return $torrent; @@ -74,7 +74,7 @@ function tracker_unregister ($attach_id, $mode = '') { if (!$torrent) { - message_die(GENERAL_ERROR, 'Torrent not found'); + message_die(GENERAL_ERROR, $lang['TOR_NOT_FOUND']); } if (!$torrent['tracker_status']) { @@ -165,15 +165,14 @@ function tracker_unregister ($attach_id, $mode = '') function delete_torrent ($attach_id, $mode = '') { - global $lang, $userdata; - global $reg_mode, $topic_id; + global $lang, $userdata, $reg_mode, $topic_id; $attach_id = intval($attach_id); $reg_mode = $mode; if (!$torrent = get_torrent_info($attach_id)) { - message_die(GENERAL_ERROR, 'Torrent not found'); + message_die(GENERAL_ERROR, $lang['TOR_NOT_FOUND']); } $post_id = $torrent['post_id']; @@ -202,7 +201,7 @@ function change_tor_status ($attach_id, $new_tor_status) if (!$torrent = get_torrent_info($attach_id)) { - bb_die('Torrent not found'); + bb_die($lang['TOR_NOT_FOUND']); } $topic_id = $torrent['topic_id']; @@ -226,13 +225,10 @@ function change_tor_type ($attach_id, $tor_status_gold) if (!$torrent = get_torrent_info($attach_id)) { - bb_die('Torrent not found'); + bb_die($lang['TOR_NOT_FOUND']); } - if (!(IS_MOD || IS_ADMIN)) - { - bb_die($lang['ONLY_FOR_MOD']); - } + if (!IS_AM) bb_die($lang['ONLY_FOR_MOD']); $topic_id = $torrent['topic_id']; $tor_status_gold = intval($tor_status_gold); @@ -255,15 +251,14 @@ function change_tor_type ($attach_id, $tor_status_gold) function tracker_register ($attach_id, $mode = '') { - global $template, $attach_config, $bb_cfg, $lang, $return_message; - global $reg_mode, $tr_cfg; + global $template, $attach_config, $bb_cfg, $lang, $return_message, $reg_mode, $tr_cfg; $attach_id = intval($attach_id); $reg_mode = $mode; if (!$torrent = get_torrent_info($attach_id)) { - bb_die('Torrent not found'); + bb_die($lang['TOR_NOT_FOUND']); } $post_id = $torrent['post_id']; @@ -343,7 +338,7 @@ function tracker_register ($attach_id, $mode = '') if (!@$info['name'] || !@$info['piece length'] || !@$info['pieces'] || strlen($info['pieces']) % 20 != 0) { - torrent_error_exit('Invalid torrent file'); + torrent_error_exit($lang['TORFILE_INVALID']); } $info_hash = pack('H*', sha1(bencode($info))); @@ -380,7 +375,7 @@ function tracker_register ($attach_id, $mode = '') } else { - torrent_error_exit('Invalid torrent file'); + torrent_error_exit($lang['TORFILE_INVALID']); } $reg_time = TIMENOW; diff --git a/upload/language/lang_english/lang_admin.php b/upload/language/lang_english/lang_admin.php index 5cbd5a51c..be21e7829 100644 --- a/upload/language/lang_english/lang_admin.php +++ b/upload/language/lang_english/lang_admin.php @@ -478,8 +478,9 @@ $lang['RANKS_TITLE'] = 'Rank Administration'; $lang['RANKS_EXPLAIN'] = 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility'; $lang['ADD_NEW_RANK'] = 'Add new rank'; - $lang['RANK_TITLE'] = 'Rank Title'; +$lang['STYLE_COLOR'] = 'Style rank'; +$lang['STYLE_COLOR_FAQ'] = 'Specify class for painting at the title of the desired color. For example colorAdmin'; $lang['RANK_SPECIAL'] = 'Set as Special Rank'; $lang['RANK_MINIMUM'] = 'Minimum Posts'; $lang['RANK_MAXIMUM'] = 'Maximum Posts'; diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 5b444522c..54a2083a3 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -12,6 +12,8 @@ $lang['TRANSLATION_INFO'] = ''; // $lang['FORUM'] = 'Forum'; $lang['CATEGORY'] = 'Category'; +$lang['HIDE_CAT'] = 'Hide categories'; +$lang['HIDE_CAT_MESS'] = 'Part categories hidden options Show · Show All'; $lang['TOPIC'] = 'Topic'; $lang['TOPICS'] = 'Topics'; $lang['TOPICS_SHORT'] = 'Topics'; diff --git a/upload/language/lang_russian/lang_admin.php b/upload/language/lang_russian/lang_admin.php index c76958519..a704207dd 100644 --- a/upload/language/lang_russian/lang_admin.php +++ b/upload/language/lang_russian/lang_admin.php @@ -478,8 +478,9 @@ $lang['RANKS_TITLE'] = 'Управление званиями'; $lang['RANKS_EXPLAIN'] = 'Здесь вы можете добавлять, редактировать, просматривать и удалять звания. Вы также можете создавать специальные звания, которые могут затем быть присвоены пользователям на странице управления пользователями.'; $lang['ADD_NEW_RANK'] = 'Новое звание'; - $lang['RANK_TITLE'] = 'Звание'; +$lang['STYLE_COLOR'] = 'Стиль звания'; +$lang['STYLE_COLOR_FAQ'] = 'Укажите class для окраски звания в нужный цвет. Например colorAdmin'; $lang['RANK_SPECIAL'] = 'Специальное звание'; $lang['RANK_MINIMUM'] = 'Минимум сообщений'; $lang['RANK_MAXIMUM'] = 'Максимум сообщений'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 030d0e55b..9acce6e7d 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -17,6 +17,8 @@ $lang['TRANSLATION_INFO'] = ''; // $lang['FORUM'] = 'Форум'; $lang['CATEGORY'] = 'Категория'; +$lang['HIDE_CAT'] = 'Скрыть категории'; +$lang['HIDE_CAT_MESS'] = 'Часть категорий скрыта Опциями показа · Показать все'; $lang['TOPIC'] = 'Тема'; $lang['TOPICS'] = 'Темы'; $lang['TOPICS_SHORT'] = 'Тем'; diff --git a/upload/templates/admin/admin_forums.tpl b/upload/templates/admin/admin_forums.tpl index 4e4bc8988..6ab18752d 100644 --- a/upload/templates/admin/admin_forums.tpl +++ b/upload/templates/admin/admin_forums.tpl @@ -48,7 +48,7 @@ function toggle_cat_list (val) {L_SF_SHOW_ON_INDEX} - + {L_FORUM_STATUS} diff --git a/upload/templates/admin/admin_ranks.tpl b/upload/templates/admin/admin_ranks.tpl index 47f609e35..b2999bfd3 100644 --- a/upload/templates/admin/admin_ranks.tpl +++ b/upload/templates/admin/admin_ranks.tpl @@ -23,19 +23,19 @@ -

Style

+

{L_STYLE_COLOR}


+
{L_STYLE_COLOR_FAQ}
-

{L_RANK_IMAGE}:

+

{L_RANK_IMAGE}:


+
{L_RANK_IMAGE_EXPLAIN}


{IMAGE_DISPLAY} -

-
{L_RANK_IMAGE_EXPLAIN}
diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl index d64944165..32156fe99 100644 --- a/upload/templates/default/index.tpl +++ b/upload/templates/default/index.tpl @@ -49,7 +49,7 @@ -
Часть категорий скрыта "опциями показа" (Показать все)
+
{L_HIDE_CAT_MESS}
diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index cd6850f2f..470bc6071 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -475,7 +475,7 @@ function go_to_page ()
- Скрыть категории + {L_HIDE_CAT}
diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl index f404477aa..47c75702a 100644 --- a/upload/templates/default/posting_editor.tpl +++ b/upload/templates/default/posting_editor.tpl @@ -88,7 +88,7 @@ ajax.callback.posts = function(data){   - +     diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl index 8cddafc2d..a667db373 100644 --- a/upload/templates/default/viewforum.tpl +++ b/upload/templates/default/viewforum.tpl @@ -434,7 +434,7 @@ td.topic_id { cursor: pointer; }
- {t.TOR_STATUS_ICON}· + {t.TOR_STATUS_ICON}· {ICON_NEWEST_REPLY} {L_TOPIC_MOVED} {L_TOPIC_DL} diff --git a/upload/viewforum.php b/upload/viewforum.php index 4b21087f5..ea71b3428 100644 --- a/upload/viewforum.php +++ b/upload/viewforum.php @@ -544,6 +544,7 @@ foreach ($topic_rowset as $topic) 'TOR_TYPE' => $is_gold, 'TOR_STATUS_ICON' => isset($topic['tor_status']) ? $bb_cfg['tor_icons'][$topic['tor_status']] : '', + 'TOR_STATUS_TEXT' => isset($topic['tor_status']) ? $lang['TOR_STATUS_NAME'][$topic['tor_status']] : '', 'ATTACH' => $topic['topic_attachment'], 'STATUS' => $topic['topic_status'],