From f371e334802168648422ba2a7da5840bbf6174f5 Mon Sep 17 00:00:00 2001
From: ling <1042585959@qq.com>
Date: Thu, 25 Apr 2024 09:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B1=89=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../luasrc/view/modem/plugin_info.htm | 56 +++++++++----------
luci-app-modem/po/zh-cn/modem.po | 2 +-
.../po/{zh_Hans => zh_Hans/modem.po} | 6 +-
luci-app-modem/root/etc/init.d/modem | 12 ++--
4 files changed, 38 insertions(+), 38 deletions(-)
rename luci-app-modem/po/{zh_Hans => zh_Hans/modem.po} (97%)
diff --git a/luci-app-modem/luasrc/view/modem/plugin_info.htm b/luci-app-modem/luasrc/view/modem/plugin_info.htm
index 1a5c36f..47ac3c9 100644
--- a/luci-app-modem/luasrc/view/modem/plugin_info.htm
+++ b/luci-app-modem/luasrc/view/modem/plugin_info.htm
@@ -151,13 +151,13 @@
| <%:Status%> |
- | <%:USB Network%> |
- usbnet.ko |
+ <%:USB Network%> |
+ usbnet.ko |
- |
- | <%:Serial Port%> |
- qcserial.ko |
+ <%:Serial Port%> |
+ qcserial.ko |
- |
@@ -177,28 +177,28 @@
<%:Status%> |
- | <%:QMI%> |
- qmi_wwan.ko |
+ <%:QMI%> |
+ qmi_wwan.ko |
- |
- | <%:ECM%> |
- cdc_ether.ko |
+ <%:ECM%> |
+ cdc_ether.ko |
- |
- | <%:MBIM%> |
- cdc_mbim.ko |
+ <%:MBIM%> |
+ cdc_mbim.ko |
- |
- | <%:RNDIS%> |
- rndis_host.ko |
+ <%:RNDIS%> |
+ rndis_host.ko |
- |
- | <%:NCM%> |
- cdc_ncm.ko |
+ <%:NCM%> |
+ cdc_ncm.ko |
- |
@@ -218,38 +218,38 @@
<%:Status%> |
- | <%:General%> |
- mhi_net.ko |
+ <%:General%> |
+ mhi_net.ko |
- |
- | <%:General%> |
- qrtr_mhi.ko |
+ <%:General%> |
+ qrtr_mhi.ko |
- |
- | <%:General%> |
- mhi_pci_generic.ko |
+ <%:General%> |
+ mhi_pci_generic.ko |
- |
- | <%:General%> |
- mhi_wwan_mbim.ko |
+ <%:General%> |
+ mhi_wwan_mbim.ko |
- |
- | <%:General%> |
- mhi_wwan_ctrl.ko |
+ <%:General%> |
+ mhi_wwan_ctrl.ko |
- |
- | <%:Private%> |
- pcie_mhi.ko |
+ <%:Private%> |
+ pcie_mhi.ko |
- |
- | <%:Private%> |
- mtk_pcie_wwan_m80.ko |
+ <%:Private%> |
+ mtk_pcie_wwan_m80.ko |
- |
diff --git a/luci-app-modem/po/zh-cn/modem.po b/luci-app-modem/po/zh-cn/modem.po
index a3a73e7..aef3c26 100644
--- a/luci-app-modem/po/zh-cn/modem.po
+++ b/luci-app-modem/po/zh-cn/modem.po
@@ -569,7 +569,7 @@ msgid "modemmanager Version"
msgstr "modemmanager 版本"
msgid "Modem General Driver Info"
-msgstr "模组通用信息"
+msgstr "模组通用驱动信息"
msgid "Driver Type"
msgstr "驱动类型"
diff --git a/luci-app-modem/po/zh_Hans b/luci-app-modem/po/zh_Hans/modem.po
similarity index 97%
rename from luci-app-modem/po/zh_Hans
rename to luci-app-modem/po/zh_Hans/modem.po
index 641d62f..aef3c26 100644
--- a/luci-app-modem/po/zh_Hans
+++ b/luci-app-modem/po/zh_Hans/modem.po
@@ -547,8 +547,8 @@ msgstr "手动配置"
msgid "Enable the manual configuration of modem information"
msgstr "启用手动配置模组信息"
-msgid "(After enable, the automatic scanning function for modem information will be disabled)"
-msgstr "（启用后将禁用自动扫描模组信息功能）"
+msgid "(After enable, the automatic scanning and configuration function for modem information will be disabled)"
+msgstr "（启用后将禁用自动扫描配置模组信息功能）"
msgid "Plugin Info"
msgstr "插件信息"
@@ -569,7 +569,7 @@ msgid "modemmanager Version"
msgstr "modemmanager 版本"
msgid "Modem General Driver Info"
-msgstr "模组通用信息"
+msgstr "模组通用驱动信息"
msgid "Driver Type"
msgstr "驱动类型"
diff --git a/luci-app-modem/root/etc/init.d/modem b/luci-app-modem/root/etc/init.d/modem
index 597090b..3fa5b54 100755
--- a/luci-app-modem/root/etc/init.d/modem
+++ b/luci-app-modem/root/etc/init.d/modem
@@ -676,14 +676,14 @@ manual_set_modem_config()
#获取网络设备路径
local network_path="$(readlink -f /sys/class/net/${network})"
- #只处理最上级的网络设备
- local count=$(echo "${network_path}" | grep -o "/net" | wc -l)
- [ "$count" -ge "2" ] && return
+ #只处理最上级的网络设备
+ local count=$(echo "${network_path}" | grep -o "/net" | wc -l)
+ [ "$count" -ge "2" ] && return
#判断路径是否带有usb（排除其他eth网络设备）
- if [[ "$network" = *"eth"* ]] && [[ "$network_path" != *"usb"* ]]; then
- return
- fi
+ if [[ "$network" = *"eth"* ]] && [[ "$network_path" != *"usb"* ]]; then
+ return
+ fi
#获取物理路径
local physical_path=$(m_get_device_physical_path ${network_path})