Skip to content

Commit

Permalink
0.5.2 rev 3426
Browse files Browse the repository at this point in the history
  • Loading branch information
nightflyza committed Mar 26, 2014
1 parent 283f652 commit 3e02ee2
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion RELEASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.2 rev 3423
0.5.2 rev 3426
2 changes: 1 addition & 1 deletion config/alter.ini
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ BUILD_OWNERS="ЖЭК,Частный"
;build extended options in format "max floors,max entrances"
BUILD_EXTOPTS="16,12"
;UKV functionality enabled
UKV_ENABLED=1
UKV_ENABLED=0
;UKV bank statements payment ID
UKV_BS_PAYID=3
;UKV max debt limit
Expand Down
2 changes: 1 addition & 1 deletion content/users.cache.dat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a:2:{s:5:"nicks";a:5:{s:7:"tester2";s:7:"tester2";s:4:"demo";s:4:"demo";s:7:"supra12";s:7:"Supra12";s:5:"admin";s:13:"Administrator";s:6:"testme";s:6:"TestMe";}s:5:"mails";a:5:{s:7:"tester2";s:15:"[email protected]";s:4:"demo";s:12:"[email protected]";s:7:"supra12";s:11:"[email protected]";s:5:"admin";s:11:"[email protected]";s:6:"testme";s:14:"[email protected]";}}
a:2:{s:5:"nicks";a:6:{s:7:"tester2";s:7:"tester2";s:4:"demo";s:4:"demo";s:7:"supra12";s:7:"Supra12";s:5:"admin";s:13:"Administrator";s:6:"testme";s:6:"TestMe";s:7:"supra13";s:7:"supra13";}s:5:"mails";a:6:{s:7:"tester2";s:15:"[email protected]";s:4:"demo";s:12:"[email protected]";s:7:"supra12";s:11:"[email protected]";s:5:"admin";s:11:"[email protected]";s:6:"testme";s:14:"[email protected]";s:7:"supra13";s:12:"[email protected]";}}
3 changes: 1 addition & 2 deletions languages/russian/billing.php
Original file line number Diff line number Diff line change
Expand Up @@ -1646,7 +1646,6 @@
$lang['def']['right to manage UKV users cash'] = 'Право управлять деньгами УКВ';
$lang['def']['Switch ping custom script'] = 'Скрипт кастомного пинга свитчей';
$lang['def']['right to delete UKV users'] = 'Право удалять пользователей УКВ';
$lang['def'][''] = '';
$lang['def'][''] = '';


?>
9 changes: 8 additions & 1 deletion languages/ukrainian/billing.php
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,13 @@
$lang['def']['Build extended max floors, max entrances'] = 'Макс. поверхів/підїздів розширених будинків';

//rev 3366
$lang['def']['Wrong format of a sum of money to pay'] = 'Невірний формат грошової сути. По вас вже виїхав загін карателів.';
$lang['def']['Wrong format of a sum of money to pay'] = 'Невірний формат грошової суми. По вас вже виїхав загін карателів.';
$lang['def']['right to register UKV users'] = 'Право реєструвати користувачів УКВ';
$lang['def']['right to manage UKV tariffs'] = 'Право керувати тарифами УКВ';
$lang['def']['right to manage UKV bank statements'] = 'Право керувати банківськими виписками УКВ';
$lang['def']['right to view UKV reports'] = 'Право переглядати звіти УКВ';
$lang['def']['right to manage UKV users cash'] = 'Право керувати грошима УКВ';
$lang['def']['Switch ping custom script'] = 'Скрипт кастомного опиту комутаторів';
$lang['def']['right to delete UKV users'] = 'Право видаляти користувачів УКВ';

?>
2 changes: 1 addition & 1 deletion userstats/languages/russian/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,6 @@
$lang['def']['No such document'] = 'Нету такого документа';
$lang['def']['Not existing template'] = 'Нету такого шаблона';


$lang['def']['Also promising us you pay for the current month, in accordance with your service plan. Additional services are not subject to credit.']='Также вы обязываетесь оплатить услуги за текущий месяц в соответствии с вашим тарифным планом. Дополнительные услуги не подлежат кредитованию.';

?>
2 changes: 2 additions & 0 deletions userstats/languages/ukrainian/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,6 @@
$lang['def']['No such document'] = 'Немає такого документу';
$lang['def']['Not existing template'] = 'Немає такого шаблона';

$lang['def']['Also promising us you pay for the current month, in accordance with your service plan. Additional services are not subject to credit.']='Також ви зобов`язуєтесь оплатити послуги за поточний місяць у повному обсязі, відповідно до вашого тарифного плану. Додаткові послуги не підлягають кредитуванню.';

?>
3 changes: 2 additions & 1 deletion userstats/modules/general/creditor/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ function zbs_ShowCreditForm() {
$cday=date("d");

//welcome message
$wmess=__('If you wait too long to pay for the service, here you can get credit for').' '.$sc_term.' '.__('days. The price of this service is').': '.$sc_price.' '.$us_currency;
$wmess=__('If you wait too long to pay for the service, here you can get credit for').' '.$sc_term.' '.__('days. The price of this service is').': '.$sc_price.' '.$us_currency.'. ';
$wmess.= __('Also promising us you pay for the current month, in accordance with your service plan. Additional services are not subject to credit.');
show_window(__('Credits'),$wmess);
//if day is something like that needed
if (($cday<=$sc_maxday) AND ($cday>=$sc_minday)) {
Expand Down

0 comments on commit 3e02ee2

Please sign in to comment.