fa,zh bug fixed - qrcode for trojan added

3 files changed, 18 insertions, 5 deletions

diff --git a/web/html/common/qrcode_modal.html b/web/html/common/qrcode_modal.html
index c80f8a0e..771f3241 100644
--- a/web/html/common/qrcode_modal.html
+++ b/web/html/common/qrcode_modal.html
@@ -3,7 +3,7 @@
          :closable="true" width="300px" :ok-text="qrModal.okText"
          cancel-text='{{ i18n "close" }}' :ok-button-props="{attrs:{id:'qr-modal-ok-btn'}}">
     <a-tag color="green" style="margin-bottom: 10px;display: block;text-align: center;" >click on QR Code to Copy</a-tag>
-    <canvas v-if="qrModal.inbound.protocol != Protocols.VMESS && qrModal.inbound.protocol != Protocols.VLESS" id="qrCode" style="width: 100%; height: 100%;"></canvas>
+    <canvas v-if="qrModal.inbound.protocol != Protocols.VMESS && qrModal.inbound.protocol != Protocols.VLESS && qrModal.inbound.protocol != Protocols.TROJAN" id="qrCode" style="width: 100%; height: 100%;"></canvas>
 
     <template v-if="qrModal.inbound.protocol === Protocols.VMESS" v-for="(vmess, index) in qrModal.inbound.settings.vmesses">
         <a-tag color="red" style="margin-bottom: 10px;display: block;text-align: center;" v-text="vmess.email"></a-tag>
@@ -16,6 +16,12 @@
         <canvas @click="copyTextToClipboard(`qrCode-vless-${vless.id}`,index)" :id="`qrCode-vless-${vless.id}`" style="width: 100%; height: 100%;"></canvas>
         <a-divider style="height: 2px; background-color: #7e7e7e" />
     </template>
+    
+    <template v-if="qrModal.inbound.protocol === Protocols.TROJAN" v-for="(trojan, index) in qrModal.inbound.settings.trojans">
+        <a-tag color="red" style="margin-bottom: 10px;display: block;text-align: center;" v-text="trojan.email"></a-tag>
+        <canvas @click="copyTextToClipboard(`qrCode-trojan-${trojan.password}`,index)" :id="`qrCode-trojan-${trojan.password}`" style="width: 100%; height: 100%;"></canvas>
+        <a-divider style="height: 2px; background-color: #7e7e7e" />
+    </template>
 </a-modal>
 
 <script>
@@ -110,6 +116,13 @@
                             this.setQrCode("qrCode-vless-" + vlesses[index].id ,index)
                         }
                     break;
+                    case Protocols.TROJAN: 
+                        trojans = qrModal.inbound.settings.trojans
+
+                        for (const index in trojans) {
+                            this.setQrCode("qrCode-trojan-" + trojans[index].password ,index)
+                        }
+                    break;
                     default: return null;
             }
 
diff --git a/web/html/xui/component/inbound_info.html b/web/html/xui/component/inbound_info.html
index cbf156d1..0618f02e 100644
--- a/web/html/xui/component/inbound_info.html
+++ b/web/html/xui/component/inbound_info.html
@@ -25,11 +25,11 @@
 </template>
 
 <template v-if="inbound.tls || inbound.xtls">
-    <p v-if="inbound.tls">tls: <a-tag color="green">{{ i18n "turnOn" }}</a-tag></p>
-    <p v-if="inbound.xtls">xtls: <a-tag color="green">{{ i18n "turnOn" }}</a-tag></p>
+    <p v-if="inbound.tls">tls: <a-tag color="green">{{ i18n "enabled" }}</a-tag></p>
+    <p v-if="inbound.xtls">xtls: <a-tag color="green">{{ i18n "enabled" }}</a-tag></p>
 </template>
 <template v-else>
-    <p>tls: <a-tag color="red">{{ i18n "closure" }}</a-tag></p>
+    <p>tls: <a-tag color="red">{{ i18n "disabled" }}</a-tag></p>
 </template>
 <p v-if="inbound.tls">
     tls {{ i18n "domainName" }}: <a-tag :color="inbound.serverName ? 'green' : 'orange'">[[ inbound.serverName ? inbound.serverName : '' ]]</a-tag>
diff --git a/web/html/xui/inbounds_client_row.html b/web/html/xui/inbounds_client_row.html
index cb231f5e..fa8621a8 100644
--- a/web/html/xui/inbounds_client_row.html
+++ b/web/html/xui/inbounds_client_row.html
@@ -7,7 +7,7 @@
     <a-tag v-if="client._totalGB === 0" color="blue">{{ i18n "used" }}: [[ sizeFormat(getUpStats(record, client.email) + getDownStats(record, client.email)) ]]</a-tag>
     <a-tag v-if="client._totalGB > 0 && !isTrafficExhausted(record, client.email)" color="green">{{ i18n "used" }}: [[ sizeFormat(getUpStats(record, client.email) + getDownStats(record, client.email)) ]] / [[client._totalGB]]GB</a-tag>
     <a-tag v-if="client._totalGB > 0 && isTrafficExhausted(record, client.email)" color="red">{{ i18n "used" }}: [[ sizeFormat(getUpStats(record, client.email) + getDownStats(record, client.email)) ]] / [[client._totalGB]]GB</a-tag>
-</template>                                    
+</template>
 <template slot="expiryTime" slot-scope="text, client, index">
     <template v-if="client._expiryTime > 0">
         <a-tag v-if="isExpiry(record, index)" color="red">