Serghey Rodin 10 лет назад
Родитель
Сommit
4929747f70
39 измененных файлов с 74 добавлено и 55 удалено
  1. 14 0
      web/inc/i18n/ru.php
  2. 5 0
      web/inc/main.php
  3. 2 2
      web/templates/admin/edit_cron.html
  4. 2 2
      web/templates/admin/edit_db.html
  5. 2 2
      web/templates/admin/edit_dns.html
  6. 2 2
      web/templates/admin/edit_dns_rec.html
  7. 2 2
      web/templates/admin/edit_firewall.html
  8. 2 2
      web/templates/admin/edit_ip.html
  9. 2 2
      web/templates/admin/edit_mail.html
  10. 2 2
      web/templates/admin/edit_mail_acc.html
  11. 2 2
      web/templates/admin/edit_package.html
  12. 2 2
      web/templates/admin/edit_user.html
  13. 2 2
      web/templates/admin/edit_web.html
  14. 1 1
      web/templates/admin/list_backup.html
  15. 1 1
      web/templates/admin/list_cron.html
  16. 1 1
      web/templates/admin/list_db.html
  17. 2 2
      web/templates/admin/list_dns.html
  18. 1 1
      web/templates/admin/list_ip.html
  19. 1 1
      web/templates/admin/list_log.html
  20. 1 1
      web/templates/admin/list_mail.html
  21. 1 1
      web/templates/admin/list_mail_acc.html
  22. 1 1
      web/templates/admin/list_packages.html
  23. 1 1
      web/templates/admin/list_rrd.html
  24. 1 1
      web/templates/admin/list_search.html
  25. 2 2
      web/templates/admin/list_stats.html
  26. 1 1
      web/templates/admin/list_user.html
  27. 1 1
      web/templates/admin/list_web.html
  28. 2 2
      web/templates/user/edit_dns.html
  29. 2 2
      web/templates/user/edit_user.html
  30. 2 2
      web/templates/user/edit_web.html
  31. 1 1
      web/templates/user/list_cron.html
  32. 1 1
      web/templates/user/list_db.html
  33. 2 2
      web/templates/user/list_dns.html
  34. 1 1
      web/templates/user/list_mail.html
  35. 1 1
      web/templates/user/list_mail_acc.html
  36. 1 1
      web/templates/user/list_search.html
  37. 2 2
      web/templates/user/list_stats.html
  38. 1 1
      web/templates/user/list_user.html
  39. 1 1
      web/templates/user/list_web.html

+ 14 - 0
web/inc/i18n/ru.php

@@ -470,4 +470,18 @@ $LANG['ru'] = array(
     'RESET_CODE_SENT' => 'Код для восстановления пароля был выслан на ваш электронный адрес.<br>',
     'MAIL_RESET_SUBJECT' => 'Восстановление пароля %s',
     'PASSWORD_RESET_REQUEST'=>"Чтобы восстановить пароль, пройдите по ссылке:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nВы также можете октрыть страницу https://%s/reset/?action=code&user=%s и вручную ввести код для восстановления:\n%s\n\nЕсли вы не запрашивали процедуру восстановления пароля, пожалуйста проигнорируйте это письмо и примите наши извинения.\n\n--\nПанель управления Vesta\n",
+    
+    'Jan' => 'Янв',
+    'Feb' => 'Фев',
+    'Mar' => 'Мар',
+    'Apr' => 'Апр',
+    'May' => 'Май',
+    'Jun' => 'Июн',
+    'Jul' => 'Июл',
+    'Aug' => 'Авг',
+    'Sep' => 'Сен',
+    'Oct' => 'Окт',
+    'Nov' => 'Ноя',
+    'Dec' => 'Дек',
+
 );

+ 5 - 0
web/inc/main.php

@@ -134,6 +134,11 @@ function top_panel($user, $TAB) {
     }
 }
 
+function translate_date($date){
+  $date = strtotime($date);
+  return strftime("%d &nbsp;", $date).__(strftime("%b", $date)).strftime(" &nbsp;%Y", $date);
+}
+
 function humanize_time($usage) {
     if ( $usage > 60 ) {
         $usage = $usage / 60;

+ 2 - 2
web/templates/admin/edit_cron.html

@@ -37,8 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?=__($v_status)?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_db.html

@@ -58,8 +58,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_dns.html

@@ -38,8 +38,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_dns_rec.html

@@ -37,8 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_firewall.html

@@ -48,8 +48,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_ip.html

@@ -48,8 +48,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_mail.html

@@ -37,8 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_mail_acc.html

@@ -58,8 +58,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_package.html

@@ -37,8 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_user.html

@@ -49,8 +49,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>

+ 2 - 2
web/templates/admin/edit_web.html

@@ -71,8 +71,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>

+ 1 - 1
web/templates/admin/list_backup.html

@@ -97,7 +97,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('outdated')?></div>
         </div>

+ 1 - 1
web/templates/admin/list_cron.html

@@ -114,7 +114,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/admin/list_db.html

@@ -139,7 +139,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
         </div>

+ 2 - 2
web/templates/admin/list_dns.html

@@ -100,7 +100,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
         </div>
@@ -145,7 +145,7 @@
                   <div class="l-unit__stat-cols clearfix last">
                     <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Expire')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=strftime("%d %b %Y", strtotime($data[$key]['EXP']))?></b>
+                      <b><?=translate_date($data[$key]['EXP'])?></b>
                     </div>
                   </div>
                 </td>

+ 1 - 1
web/templates/admin/list_ip.html

@@ -83,7 +83,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/admin/list_log.html

@@ -47,7 +47,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__date">
             <?=$data[$key]['TIME']?>

+ 1 - 1
web/templates/admin/list_mail.html

@@ -121,7 +121,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/admin/list_mail_acc.html

@@ -118,7 +118,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/admin/list_packages.html

@@ -81,7 +81,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/admin/list_rrd.html

@@ -82,7 +82,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__date">
             <?=$data[$key]['TIME']?>

+ 1 - 1
web/templates/admin/list_search.html

@@ -193,7 +193,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date" u_date="<?=strtotime($data[$key]['DATE'])?>">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 2 - 2
web/templates/admin/list_stats.html

@@ -72,13 +72,13 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($key))?>
+            <?=translate_date($key)?>
           </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__name separate">
-            <?=strftime("%b %Y", strtotime($key))?>
+            <?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?>
           </div>
 
 

+ 1 - 1
web/templates/admin/list_user.html

@@ -140,7 +140,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/admin/list_web.html

@@ -158,7 +158,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date" u_date="<?=strtotime('1/1/2011')?>">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
         </div>

+ 2 - 2
web/templates/user/edit_dns.html

@@ -37,8 +37,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>

+ 2 - 2
web/templates/user/edit_user.html

@@ -49,8 +49,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>

+ 2 - 2
web/templates/user/edit_web.html

@@ -71,8 +71,8 @@
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date"><?php echo $v_time?></a>
+                                    <a class="data-date"><?=translate_date($v_date)?></a><br>
+                                    <a class="data-date"><?=$v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>

+ 1 - 1
web/templates/user/list_cron.html

@@ -114,7 +114,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/user/list_db.html

@@ -140,7 +140,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 2 - 2
web/templates/user/list_dns.html

@@ -100,7 +100,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>
@@ -145,7 +145,7 @@
                   <div class="l-unit__stat-cols clearfix last">
                     <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Expire')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=strftime("%d %b %Y", strtotime($data[$key]['EXP']))?></b>
+                      <b><?=translate_date($data[$key]['EXP'])?></b>
                     </div>
                   </div>
                 </td>

+ 1 - 1
web/templates/user/list_mail.html

@@ -121,7 +121,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/user/list_mail_acc.html

@@ -117,7 +117,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/user/list_search.html

@@ -193,7 +193,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date" u_date="<?=strtotime($data[$key]['DATE'])?>">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 2 - 2
web/templates/user/list_stats.html

@@ -72,13 +72,13 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($key))?>
+            <?=translate_date($key)?>
           </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
           <div class="l-unit__name separate">
-            <?=strftime("%b %Y", strtotime($key))?>
+            <?=__(strftime("%b", strtotime($key))).strftime(" %Y", strtotime($key))?>
           </div>
 
 

+ 1 - 1
web/templates/user/list_user.html

@@ -140,7 +140,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date">
-            <?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>

+ 1 - 1
web/templates/user/list_web.html

@@ -159,7 +159,7 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__date" u_date="<?=strtotime('1/1/2011')?>">
-            <?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
+            <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
         </div>