Merge pull request hestiacp#973 from hestiacp/staging/fixes

Staging/fixes

Author: ScIT-Raphael

bin/v-change-user-php-cli

@@ -44,6 +44,11 @@ if [ ! -f "$HESTIA_INSTALL_DIR/multiphp/$WEB_SYSTEM/PHP-${version//.}.sh" ]; the
     exit
 fi
 
+#create .bash_aliases is not exsists
+if [ ! -f "$FILE" ]; then
+    touch "$FILE"
+fi
+
 if grep -q "alias php='env php$version'" "$FILE"; then
   echo "PHP CLI Already defined"
   exit;
@@ -53,11 +58,6 @@ fi
 #                       Action                             #
 #----------------------------------------------------------#
 
-#create .bash_aliases is not exsists
-if [ ! -f "$FILE" ]; then
-    touch "$FILE"
-fi
-
 sed -i "/alias php='env/d" "$FILE"
 
 echo "alias php='env php$version'" >> $FILE

bin/v-list-sys-themes

@@ -27,7 +27,11 @@ json_list() {
         if [ "$i" -lt "$object1" ]; then
             echo -e  "\t\"$theme\","
         else
-            echo -e  "\t\"$theme\""
+            if [ $object2 -gt 0 ]; then
+                echo -e  "\t\"$theme\","
+            else
+                echo -e  "\t\"$theme\""            
+            fi
         fi
         (( ++i))
     done

install/hst-install-ubuntu.sh

@@ -1766,6 +1766,7 @@ $HESTIA/bin/v-update-sys-ip > /dev/null 2>&1
 
 # Get main IP
 ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/)
+local_ip=$ip
 
 # Configuring firewall
 if [ "$iptables" = 'yes' ]; then

web/inc/i18n/cn.php

@@ -863,34 +863,34 @@
     '2FA Reset Code:' => '帐户恢复代码：',
 
         //list user 
-    'Name' => 'Name',
+    'Name' => '名称',
     //Add / Edit user
-    'Contact' => 'Name',
-    'GREETINGS_GORDON' => "Hello, %s,\n",
+    'Contact' => '联系',
+    'GREETINGS_GORDON' => "您好，%s，\n",
 
     //List Mail Accounts
-    'Forwarding' => 'Forwarding',
+    'Forwarding' => '转发',
 
     //Cron Jobs
-    'Cron Job' => 'Cron Job',
+    'Cron Job' => '定时任务',
     //Edit server 
-    'Host' => 'Host',
+    'Host' => '主机',
 
       //list Backups
-    '1 backups' => '1 backups',
-    '%s backups' => '%s backups',
+    '1 backups' => '1 数据备份',
+    '%s backups' => '%s 数据备份',
     //list Firewall Rules
-    '1 firewall rule' => '1 firewall rule',
-    '%s firewall rules' => '%s firewall rules',
+    '1 firewall rule' => '1 防火墙规则',
+    '%s firewall rules' => '%s 防火墙规则',
     //list ip
-    '1 banned IP address' => '1 banned IP address',
-    '%s banned IP addresses' => '%s banned IP addresses', 
+    '1 banned IP address' => '1 黑名单IP',
+    '%s banned IP addresses' => '%s 黑名单IP', 
     //list DNS
-    'Records_DNS' => 'Records',
+    'Records_DNS' => '记录',
     //Dowload Backup
-    'BACKUP_DOWNLOAD_SCHEDULED' => 'Download for Backup has been scheduled.',
+    'BACKUP_DOWNLOAD_SCHEDULED' => '已安排备份下载。',
 
-    'backend server' =>  'Backend Server',
-    'traffic' => 'Traffic',
-    'disk' => 'Disk',
+    'backend server' =>  '后端服务',
+    'traffic' => '流量',
+    'disk' => '磁盘',
 );