diff --git a/upload/config.php b/upload/config.php
index e0789bbda..12f0cd1f5 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';
-$bb_cfg['tp_release_state'] = 'R195';
-$bb_cfg['tp_release_date'] = '5-08-2011';
+$bb_cfg['tp_release_state'] = 'R196';
+$bb_cfg['tp_release_date'] = '6-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/index.php b/upload/index.php
index 1b845c6a4..2703ed196 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -253,7 +253,7 @@ foreach ($cat_forums as $cid => $c)
$template->assign_block_vars('c.f.sf', array(
'SF_ID' => $fid,
'SF_NAME' => $fname_html,
- 'SF_NEW' => $new ? ' new' : '',
+ 'SF_NEW' => $new ? $lang['NEW'] : '',
));
continue;
}
@@ -269,7 +269,7 @@ foreach ($cat_forums as $cid => $c)
'LAST_SF_ID' => isset($f['last_sf_id']) ? $f['last_sf_id'] : null,
'MODERATORS' => isset($moderators[$fid]) ? join(', ', $moderators[$fid]) : '',
- 'FORUM_FOLDER_ALT' => ($new) ? 'new' : 'old',
+ 'FORUM_FOLDER_ALT' => ($new) ? $lang['NEW'] : $lang['OLD'],
));
if ($f['last_post_id'])
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 8234cc691..b1bddc2af 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -1636,3 +1636,9 @@ $lang['LIST'] = 'List';
$lang['LIST_TITLE'] = 'List (Ctrl+L)';
$lang['LIST_ITEM'] = 'List item (Ctrl+0)';
$lang['QUOTE_SEL'] = 'Quote selected';
+
+$lang['NEW'] = 'New';
+$lang['NEWEST'] = 'Newest';
+$lang['LATEST'] = 'Latest';
+$lang['POST'] = 'Post';
+$lang['OLD'] = 'Old';
\ 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 537523216..991c2c9db 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -1648,3 +1648,9 @@ $lang['LIST_ITEM'] = 'Элемент списка (Ctrl+0)';
$lang['QUOTE_SEL'] = 'Цит.выдел';
$lang['TRANSLIT'] = 'Транслит';
$lang['TRANSLIT_TITLE'] = 'Перевести выделение из транслита на русский';
+
+$lang['NEW'] = 'Новое';
+$lang['NEWEST'] = 'Непрочит.';
+$lang['LATEST'] = 'Последнее';
+$lang['POST'] = 'Пост';
+$lang['OLD'] = 'Прочит';
\ No newline at end of file
diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl
index 949bc540d..bf3eccac8 100644
--- a/upload/templates/default/index.tpl
+++ b/upload/templates/default/index.tpl
@@ -216,11 +216,11 @@
-  |
+ |
{L_NEW_POSTS} |
-  |
+ |
{L_NO_NEW_POSTS} |
-  |
+ |
{L_FORUM_LOCKED_MAIN} |
diff --git a/upload/templates/default/search_results.tpl b/upload/templates/default/search_results.tpl
index 52c6e96b1..510338752 100644
--- a/upload/templates/default/search_results.tpl
+++ b/upload/templates/default/search_results.tpl
@@ -99,12 +99,12 @@
{ICON_NEWEST_REPLY}
- {L_MOVED}
- {L_ANNOUNCE}
- {L_DL_TOPIC}
+ {L_TOPIC_MOVED}
+ {L_TOPIC_ANNOUNCEMENT}
+ {L_TOPIC_DL}
{TOPIC_ATTACH_ICON}
- {L_POLL}
+ {L_TOPIC_POLL}
{t.TOPIC_TITLE}
[{ICON_GOTOPOST}{L_GOTO_SHORT} {t.PAGINATION} ]
diff --git a/upload/templates/default/tpl_config.php b/upload/templates/default/tpl_config.php
index 0560ad68d..6162dc1f4 100644
--- a/upload/templates/default/tpl_config.php
+++ b/upload/templates/default/tpl_config.php
@@ -132,22 +132,22 @@ if (!empty($page_cfg['load_tpl_vars']) AND $vars = array_flip($page_cfg['load_tp
if (isset($vars['post_buttons']))
{
$template->assign_vars(array(
- 'QUOTE_IMG' => ($bb_cfg['text_buttons']) ? $lang['REPLY_WITH_QUOTE_TXTB'] : ' ',
- 'EDIT_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['EDIT_DELETE_POST_TXTB'] : ' ',
- 'DELETE_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['DELETE_POST_TXTB'] : ' ',
- 'IP_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['VIEW_IP_TXTB'] : ' ',
- 'MOD_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['MODERATE_POST_TXTB'] : ' ',
+ 'QUOTE_IMG' => ($bb_cfg['text_buttons']) ? $lang['REPLY_WITH_QUOTE_TXTB'] : '',
+ 'EDIT_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['EDIT_DELETE_POST_TXTB'] : '',
+ 'DELETE_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['DELETE_POST_TXTB'] : '',
+ 'IP_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['VIEW_IP_TXTB'] : '',
+ 'MOD_POST_IMG' => ($bb_cfg['text_buttons']) ? $lang['MODERATE_POST_TXTB'] : '',
'QUOTE_URL' => BB_ROOT ."posting.php?mode=quote&p=",
'EDIT_POST_URL' => BB_ROOT ."posting.php?mode=editpost&p=",
'DELETE_POST_URL' => BB_ROOT ."posting.php?mode=delete&p=",
'IP_POST_URL' => BB_ROOT ."modcp.php?mode=ip&p=",
- 'PROFILE_IMG' => ($bb_cfg['text_buttons']) ? $lang['READ_PROFILE_TXTB'] : ' ',
- 'PM_IMG' => ($bb_cfg['text_buttons']) ? $lang['SEND_PM_TXTB'] : ' ',
- 'EMAIL_IMG' => ($bb_cfg['text_buttons']) ? $lang['SEND_EMAIL_TXTB'] : ' ',
- 'WWW_IMG' => ($bb_cfg['text_buttons']) ? $lang['VISIT_WEBSITE_TXTB'] : ' ',
- 'ICQ_IMG' => ($bb_cfg['text_buttons']) ? $lang['ICQ_TXTB'] : ' ',
+ 'PROFILE_IMG' => ($bb_cfg['text_buttons']) ? $lang['READ_PROFILE_TXTB'] : '',
+ 'PM_IMG' => ($bb_cfg['text_buttons']) ? $lang['SEND_PM_TXTB'] : '',
+ 'EMAIL_IMG' => ($bb_cfg['text_buttons']) ? $lang['SEND_EMAIL_TXTB'] : '',
+ 'WWW_IMG' => ($bb_cfg['text_buttons']) ? $lang['VISIT_WEBSITE_TXTB'] : '',
+ 'ICQ_IMG' => ($bb_cfg['text_buttons']) ? $lang['ICQ_TXTB'] : '',
'EMAIL_URL' => BB_ROOT ."profile.php?mode=email&u=",
'FORUM_URL' => BB_ROOT . FORUM_URL,
@@ -159,11 +159,11 @@ if (!empty($page_cfg['load_tpl_vars']) AND $vars = array_flip($page_cfg['load_tp
if (isset($vars['post_icons']))
{
$template->assign_vars(array(
- 'MINIPOST_IMG' => ' ',
- 'ICON_GOTOPOST' => ' ',
- 'MINIPOST_IMG_NEW' => ' ',
- 'ICON_LATEST_REPLY' => ' ',
- 'ICON_NEWEST_REPLY' => ' ',
+ 'MINIPOST_IMG' => '!['.$lang['POST'].']('. $images['icon_minipost'] .') ',
+ 'ICON_GOTOPOST' => '!['.$lang['GO'].']('. $images['icon_gotopost'] .' "'. $lang['GOTO_PAGE'] .'") ',
+ 'MINIPOST_IMG_NEW' => '',
+ 'ICON_LATEST_REPLY' => '',
+ 'ICON_NEWEST_REPLY' => '',
));
}
if (isset($vars['topic_icons']))
@@ -173,17 +173,13 @@ if (!empty($page_cfg['load_tpl_vars']) AND $vars = array_flip($page_cfg['load_tp
'ANNOUNCE' => POST_ANNOUNCE,
'STICKY' => POST_STICKY,
'LOCKED' => TOPIC_LOCKED,
- 'L_MOVED' => $lang['TOPIC_MOVED'],
- 'L_ANNOUNCE' => $lang['TOPIC_ANNOUNCEMENT'],
- 'L_DL_TOPIC' => $lang['TOPIC_DL'],
- 'L_POLL' => $lang['TOPIC_POLL'],
));
}
if (isset($vars['pm_icons']))
{
$template->assign_vars(array(
- 'INBOX_IMG' => ' ',
- 'OUTBOX_IMG' => ' ',
+ 'INBOX_IMG' => ' ',
+ 'OUTBOX_IMG' => ' ',
'SENTBOX_IMG' => ' ',
'SAVEBOX_IMG' => ' ',
));
diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl
index 90354b5f3..ae4f05ee8 100644
--- a/upload/templates/default/viewforum.tpl
+++ b/upload/templates/default/viewforum.tpl
@@ -444,10 +444,10 @@ td.topic_id { cursor: pointer; }
{t.TOR_STATUS_ICON}·
{ICON_NEWEST_REPLY}
- {L_MOVED}
- {L_DL_TOPIC}
+ {L_TOPIC_MOVED}
+ {L_TOPIC_DL}
- {L_POLL}
+ {L_TOPIC_POLL}
{TOPIC_ATTACH_ICON}
{t.TOPIC_TITLE}
@@ -545,11 +545,11 @@ td.topic_id { cursor: pointer; }
{ICON_NEWEST_REPLY}
- {L_MOVED}
- {L_DL_TOPIC}
+ {L_TOPIC_MOVED}
+ {L_TOPIC_DL}
{TOPIC_ATTACH_ICON}
- {L_POLL}
+ {L_TOPIC_POLL}
{t.TOPIC_TITLE}
[{ICON_GOTOPOST}{L_GOTO_SHORT} {t.PAGINATION} ]
| |