diff --git a/upload/ajax.php b/upload/ajax.php
index 241ca9a72..b588a89dc 100644
--- a/upload/ajax.php
+++ b/upload/ajax.php
@@ -290,7 +290,7 @@ class ajax_common
function change_user_rank ()
{
- global $datastore;
+ global $datastore, $lang;
$ranks = $datastore->get('ranks');
$rank_id = intval($this->request['rank_id']);
@@ -306,7 +306,7 @@ class ajax_common
DB()->query("UPDATE ". BB_USERS ." SET user_rank = $rank_id WHERE user_id = $user_id LIMIT 1");
- $this->response['html'] = ($rank_id != 0) ? 'Присвоено звание '. $ranks[$rank_id]['rank_title'] .'' : 'Звание снято';
+ $this->response['html'] = ($rank_id != 0) ? $lang['AWARDED_RANK'] . ' '. $ranks[$rank_id]['rank_title'] .'' : $lang['SHOT_RANK'];
}
function change_user_opt ()
diff --git a/upload/config.php b/upload/config.php
index 418ff710b..db5d9f6f9 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 Beta';
-$bb_cfg['tp_release_state'] = 'R218';
+$bb_cfg['tp_release_state'] = 'R219';
$bb_cfg['tp_release_date'] = '17-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/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 568afa244..cffb3fe32 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -145,12 +145,12 @@ $lang['POSTED_ARTICLES_ZERO_TOTAL'] = 'Our users have posted a total of 0
$lang['POSTED_ARTICLES_TOTAL'] = 'Our users have posted a total of %s articles'; // Number of posts
$lang['REGISTERED_USERS_ZERO_TOTAL'] = 'We have 0 registered users'; // # registered users
$lang['REGISTERED_USERS_TOTAL'] = 'We have %s registered users'; // # registered users
-$lang['USERS_TOTAL_GENDER'] = 'Boys: %d, girls: %d, others: %d';
+$lang['USERS_TOTAL_GENDER'] = 'Boys: %d, Girls: %d, Others: %d';
$lang['NEWEST_USER'] = 'The newest registered user is %s%s%s'; // a href, username, /a
// Tracker stats
-$lang['TORRENTS_STAT'] = 'Torrents: %s, total size: %s'; // first %s = number of torrents, second %s is the total size.
-$lang['PEERS_STAT'] = 'Peers: %s, seeders: %s, leechers: %s'; // first %s = number of peers, second %s = number of seeders, third %s = number of leechers.
+$lang['TORRENTS_STAT'] = 'Torrents: %s, Total size: %s'; // first %s = number of torrents, second %s is the total size.
+$lang['PEERS_STAT'] = 'Peers: %s, Seeders: %s, Leechers: %s'; // first %s = number of peers, second %s = number of seeders, third %s = number of leechers.
$lang['SPEED_STAT'] = 'Total speed: %s '; // %s = total speed.
$lang['NO_NEW_POSTS_LAST_VISIT'] = 'No new posts since your last visit';
@@ -547,6 +547,8 @@ $lang['HIDDEN_EMAIL'] = '[ Hidden ]';
$lang['INTERESTS'] = 'Interests';
$lang['OCCUPATION'] = 'Occupation';
$lang['POSTER_RANK'] = 'Poster rank';
+$lang['AWARDED_RANK'] = 'Awarded rank';
+$lang['SHOT_RANK'] = 'Shot rank';
$lang['TOTAL_POSTS'] = 'Total posts';
$lang['SEARCH_USER_POSTS'] = 'Find posts'; // Find all posts by username
@@ -583,8 +585,8 @@ $lang['WRONG_BIRTHDAY_FORMAT'] = 'The birthday format was entered incorrectly.';
$lang['AGE'] = 'Age';
$lang['BIRTHDAY_TO_HIGH'] = 'Sorry, this site, does not accept user older than %d years old';
$lang['BIRTHDAY_TO_LOW'] = 'Sorry, this site, does not accept user yonger than %d years old';
-$lang['BIRTHDAY_TODAY'] = 'Users with a birthday today:';
-$lang['BIRTHDAY_WEEK'] = 'Users with a birthday within the next %d days:';
+$lang['BIRTHDAY_TODAY'] = 'Users with a birthday today: ';
+$lang['BIRTHDAY_WEEK'] = 'Users with a birthday within the next %d days: %s';
$lang['NOBIRTHDAY_WEEK'] = 'No users are having a birthday in the upcoming %d days'; // %d is substitude with the number of days
$lang['NOBIRTHDAY_TODAY'] = 'No users have a birthday today';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index fa9676185..0ffe4d85f 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -149,11 +149,11 @@ $lang['POSTED_ARTICLES_ZERO_TOTAL'] = 'Наши пользователи не о
$lang['POSTED_ARTICLES_TOTAL'] = 'Наши пользователи оставили сообщений: %s'; // Number of posts
$lang['REGISTERED_USERS_ZERO_TOTAL'] = 'У нас нет зарегистрированных пользователей'; // # registered users
$lang['REGISTERED_USERS_TOTAL'] = 'Всего зарегистрированных пользователей: %s'; // # registered users
-$lang['USERS_TOTAL_GENDER'] = 'Парней: %d, девушек: %d, ещё не определились: %d';
+$lang['USERS_TOTAL_GENDER'] = 'Парней: %d, Девушек: %d, Не указан: %d';
$lang['NEWEST_USER'] = 'Последний зарегистрированный пользователь: %s%s%s'; // username
// Tracker stats
-$lang['TORRENTS_STAT'] = 'Раздач: %s, общий размер: %s'; // first %s = number of torrents, second %s is the total size.
+$lang['TORRENTS_STAT'] = 'Раздач: %s, Общий размер: %s'; // first %s = number of torrents, second %s is the total size.
$lang['PEERS_STAT'] = 'Пиров: %s, Сидов: %s, Личеров: %s'; // first %s = number of peers, second %s = number of seeders, third %s = number of leechers.
$lang['SPEED_STAT'] = 'Скорость обмена: %s '; // %s = total speed.
@@ -552,6 +552,9 @@ $lang['HIDDEN_EMAIL'] = '[ скрыт ]';
$lang['INTERESTS'] = 'Интересы';
$lang['OCCUPATION'] = 'Род занятий';
$lang['POSTER_RANK'] = 'Звание';
+$lang['AWARDED_RANK'] = 'Присвоено звание';
+$lang['SHOT_RANK'] = 'Звание снято';
+
$lang['TOTAL_POSTS'] = 'Всего сообщений';
$lang['SEARCH_USER_POSTS'] = 'Найти сообщения'; // Find all posts by username
@@ -589,7 +592,7 @@ $lang['WRONG_BIRTHDAY_FORMAT'] = 'Дата рождения указана не
$lang['AGE'] = 'Возраст';
$lang['BIRTHDAY_TO_HIGH'] = 'Извините, сайт запрещено посещать людям старше %d лет';
$lang['BIRTHDAY_TO_LOW'] = 'Извините, сайт запрещено посещать детям младше %d лет';
-$lang['BIRTHDAY_TODAY'] = 'Пользователи, празднующие День Рождения сегодня:';
+$lang['BIRTHDAY_TODAY'] = 'Пользователи, празднующие День Рождения сегодня: ';
$lang['BIRTHDAY_WEEK'] = 'Пользователи, празднующие День Рождения в ближайшие %d дней: %s';
$lang['NOBIRTHDAY_WEEK'] = 'В ближайшие %d дней никто не празднует День Рождения.'; // %d is substitude with the number of days
$lang['NOBIRTHDAY_TODAY'] = 'Сегодня никто не празднует День Рождения.';
diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl
index 06065856f..75d2f7740 100644
--- a/upload/templates/default/usercp_viewprofile.tpl
+++ b/upload/templates/default/usercp_viewprofile.tpl
@@ -21,7 +21,7 @@ ajax.callback.edit_user_profile = function(data){
// change_user_rank
ajax.change_user_rank = function(uid, rank_id) {
- $('#rank-msg').html('выполняется...');
+ $('#rank-msg').html('{L_LOADING}');
ajax.exec({
action : 'change_user_rank',
user_id : uid,
diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/templates/default/viewtopic_attach.tpl
index 15e7f94c4..e519a93bd 100644
--- a/upload/templates/default/viewtopic_attach.tpl
+++ b/upload/templates/default/viewtopic_attach.tpl
@@ -428,7 +428,7 @@ $('#tor-filelist-btn').click(function(){
-
+
{L_LOADING} |