Просмотр исходного кода

replaced echo with printf to replace placeholder

Jaap Marcus 5 лет назад
Родитель
Сommit
4b74544ea8

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

@@ -112,7 +112,7 @@
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-            echo ngettext('%d backup', '%d backups', $i);
+            printf(ngettext('%d backup', '%d backups', $i),$i);
             ?>
           </div>
         </div>

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

@@ -133,7 +133,7 @@ sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo
         <table class='data'></table>
         <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-            echo ngettext('%d cron job', '%d cron jobs', $i);
+            printf(ngettext('%d cron job', '%d cron jobs', $i),$i);
             ?>                
         </div>
       </div>

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

@@ -168,7 +168,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-            echo ngettext('%d SQL database', '%d SQL databases', $i);
+            printf(ngettext('%d SQL database', '%d SQL databases', $i),$i);
             ?>
           </div>
         </div>

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

@@ -136,7 +136,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-            echo ngettext('%d DNS zone', '%d DNS zones', $i);
+            printf(ngettext('%d DNS zone', '%d DNS zones', $i),$i);
             ?>
           </div>
         </div>

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

@@ -101,7 +101,7 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right total clearfix">
             <?php
-            echo ngettext('%d DNS record', '%d DNS records', $i);
+            printf(ngettext('%d DNS record', '%d DNS records', $i),$i);
             ?>
           </div>
           <div class="data-count l-unit__col l-unit__col--right back clearfix">

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

@@ -141,7 +141,7 @@ sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$k
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-              echo ngettext('%d firewall rule', '%d firewall rules', $i);
+               printf(ngettext('%d firewall rule', '%d firewall rules', $i),$i);
             ?>
           </div>
       </div>

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

@@ -88,7 +88,7 @@
               if ( $i == 0) {
                 echo _('There are currently no banned IP addresses.');
               }else{
-                echo ngettext('%d banned IP address', '%d banned IP addresses', $i);
+                printf(ngettext('%d banned IP address', '%d banned IP addresses', $i),$i);
               }
             ?>
           </div>

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

@@ -104,7 +104,7 @@
               if ( $i == 0) {
                 echo _('There are currently no IP lists defined.');
               }else{
-                echo ngettext('%d Ipset list', '%d Ipset lists', $i);
+                 printf(ngettext('%d Ipset list', '%d Ipset lists', $i),$i);
               }
             ?>
           </div>

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

@@ -107,7 +107,7 @@ sort-owner="<?=$data[$key]['OWNER']?>" sort-star="<? if($_SESSION['favourites'][
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-                echo ngettext('%d IP address', '%d IP addresses', $i);
+            printf(ngettext('%d IP address', '%d IP addresses', $i),$i);
             ?>
           </div>
       </div>

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

@@ -58,7 +58,7 @@
                 <table class='data'></table>
                 <div class="data-count l-unit__col l-unit__col--right clearfix">
                 <?php
-                echo ngettext('%d SSH Key', '%d SSH Keys', $i);
+                printf(ngettext('%d SSH Key', '%d SSH Keys', $i),$i);
                 ?>
       </div>
     </div>

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

@@ -57,7 +57,7 @@
       <table class='data'></table>
       <div class="data-count l-unit__col l-unit__col--right clearfix">
         <?
-          echo ngettext('%d log record', '%d log records', $i);
+          printf(ngettext('%d log record', '%d log records', $i),$i);
         ?>
       </div>
     </div>

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

@@ -214,7 +214,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
               <?php
-                 echo ngettext('%d mail domain', '%d mail domains', $i);
+                 printf(ngettext('%d mail domain', '%d mail domains', $i),$i);
               ?>
           </div>
         </div>

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

@@ -182,7 +182,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-               echo ngettext('%d mail account', '%d mail accounts', $i);
+               printf(ngettext('%d mail account', '%d mail accounts', $i),$i);
             ?>
           </div>
           <div class="data-count l-unit__col l-unit__col--right back clearfix">

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

@@ -202,7 +202,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
         <table class='data'></table>
         <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-             echo ngettext('%d package', '%d packages', $i);
+             printf(ngettext('%d package', '%d packages', $i),$i);
             ?>
         </div>
     </div>

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

@@ -194,7 +194,7 @@
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
               <?php
-               echo ngettext('%d object', '%d objects', $i);
+               printf(ngettext('%d object', '%d objects', $i),$i);
               ?>
           </div>
         </div>

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

@@ -89,7 +89,7 @@
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-              echo ngettext('%d month', '%d months', $i);
+              printf(ngettext('%d month', '%d months', $i),$i);
             ?>
           </div>
       </div>

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

@@ -161,7 +161,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-              echo ngettext('%d user account', '%d user accounts', $i);
+              printf(ngettext('%d user account', '%d user accounts', $i),$i);
             ?>
           </div>
       </div>

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

@@ -213,7 +213,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
       <table class='data'></table>
       <div class="data-count l-unit__col l-unit__col--right clearfix">
         <?php
-          echo ngettext('%d web domain', '%d web domains', $i);
+          printf(ngettext('%d web domain', '%d web domains', $i),$i);
         ?>
       </div>
   </div>

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

@@ -167,7 +167,7 @@ sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" so
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-            echo ngettext('%d SQL database', '%d SQL databases', $i);
+            printf(ngettext('%d SQL database', '%d SQL databases', $i),$i);
             ?>
           </div>
         </div>

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

@@ -135,7 +135,7 @@ sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$ke
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-            echo ngettext('%d DNS zone', '%d DNS zones', $i);
+            printf(ngettext('%d DNS zone', '%d DNS zones', $i),$i);
             ?>
           </div>
         </div>

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

@@ -97,7 +97,7 @@ v_unit_id="<?=$key?>" v_section="dns_rec">
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right total clearfix">
             <?php
-            echo ngettext('%d DNS record', '%d DNS records', $i);
+            printf(ngettext('%d DNS record', '%d DNS records', $i),$i);
             ?>
           </div>
           <div class="data-count l-unit__col l-unit__col--right back clearfix">

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

@@ -213,14 +213,7 @@ sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favouri
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-             echo ngettext('%d mail domain', '%d mail domains', $i);
-            ?>
-            <?php
-              if ( $i == 1) {
-                echo _('1 mail domain');
-              } else {
-                echo _('%s mail domains',$i);
-              }
+             printf(ngettext('%d mail domain', '%d mail domains', $i),$i);
             ?>
           </div>
         </div>

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

@@ -182,7 +182,7 @@ sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] =
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-               echo ngettext('%d mail account', '%d mail accounts', $i);
+               printf(ngettext('%d mail account', '%d mail accounts', $i),$i);
             ?>
           </div>
           <div class="data-count l-unit__col l-unit__col--right back clearfix">

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

@@ -192,7 +192,7 @@
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-              echo ngettext('%d object', '%d objects', $i);
+              printf(ngettext('%d object', '%d objects', $i),$i);
             ?>
           </div>
         </div>

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

@@ -75,7 +75,7 @@
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
               <?php
-                echo ngettext('%d month', '%d months', $i);
+                printf(ngettext('%d month', '%d months', $i),$i);
               ?>
           </div>
       </div>

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

@@ -129,7 +129,7 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
           <table class='data'></table>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
-              echo ngettext('%d user account', '%d user accounts', $i);
+              printf(ngettext('%d user account', '%d user accounts', $i),$i);
             ?>
           </div>
       </div>

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

@@ -218,7 +218,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
       <table class='data'></table>
       <div class="data-count l-unit__col l-unit__col--right clearfix">
         <?php
-          echo ngettext('%d web domain', '%d web domains', $i);
+          printf(ngettext('%d web domain', '%d web domains', $i),$i);
         ?>
       </div>
   </div>