refactor: refactor style

0x676e67 · Mar 2, 2023 · 1535459 · 1535459
1 parent 12b0093
commit 1535459
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/luasrc/model/cbi/design-config.lua b/luasrc/model/cbi/design-config.lua
@@ -3,10 +3,10 @@ local nutil = require 'nixio.util'
 local name = 'design'
 local uci = require 'luci.model.uci'.cursor()
 
-local mode, navbar_proxy_icon
+local mode, navbar_proxy
 if nxfs.access('/etc/config/design') then
     mode = uci:get_first('design', 'global', 'mode')
-	navbar_proxy_icon = uci:get_first('design', 'global', 'navbar_proxy_icon')
+	navbar_proxy = uci:get_first('design', 'global', 'navbar_proxy')
 end
 
 function glob(...)
@@ -32,21 +32,21 @@ o.default = mode
 o.rmempty = false
 o.description = translate('You can choose Theme color mode here')
 
-o = s:option(ListValue, 'navbar_proxy_icon', translate('Navigation bar proxy icon'))
-o:value('openclash', translate('openclash'))
-o:value('shadowsocksr', translate('shadowsocksr'))
-o:value('vssr', translate('vssr'))
-o:value('passwall', translate('passwall'))
-o:value('passwall2', translate('passwall2'))
-o.default = navbar_proxy_icon
+o = s:option(ListValue, 'navbar_proxy', translate('Navigation bar proxy'))
+o:value('openclash', 'openclash')
+o:value('shadowsocksr', 'shadowsocksr')
+o:value('vssr', 'vssr')
+o:value('passwall', 'passwall')
+o:value('passwall2', 'passwall2')
+o.default = navbar_proxy
 o.rmempty = false
-o.description = translate('Show OpenClash icon by default')
+o.description = translate('OpenClash by default')
 
 o = s:option(Button, 'save', translate('Save Changes'))
 o.inputstyle = 'reload'
 
 function br.handle(self, state, data)
-    if (state == FORM_VALID and data.mode ~= nil  and data.navbar_proxy_icon ~= nil) then
+    if (state == FORM_VALID and data.mode ~= nil  and data.navbar_proxy ~= nil) then
         nxfs.writefile('/tmp/aaa', data)
         for key, value in pairs(data) do
             uci:set('design','@global[0]',key,value)

diff --git a/po/zh-cn/design-config.po b/po/zh-cn/design-config.po
@@ -22,11 +22,11 @@ msgstr "强制暗色"
 msgid "You can choose Theme color mode here"
 msgstr "你可以选择喜欢的主题模式"
 
-msgid "Navigation bar proxy icon"
-msgstr "导航栏代理图标"
+msgid "Navigation bar proxy"
+msgstr "导航栏代理"
 
-msgid "Show OpenClash icon by default"
-msgstr "默认显示 OpenClash 图标"
+msgid "OpenClash by default"
+msgstr "默认 OpenClash"
 
 msgid "Save Changes"
 msgstr "保存更改"
diff --git a/root/etc/config/design b/root/etc/config/design
@@ -1,3 +1,3 @@
 config global
 	option mode 'dark'
-	option navbar_proxy_icon 'openclash'
+	option navbar_proxy 'openclash'