Merge remote-tracking branch 'origin/master'

module/webui/config.py

@@ -23,6 +23,9 @@ def poor_yaml_write_with_lock(data, file, template_file=DEPLOY_TEMPLATE):
 
 class WebuiConfig:
     Language = 'zh-CN'
+    WebuiPort = 22267
+    Theme = 'default'
+    Password = None
 
     def __init__(self, file=DEPLOY_CONFIG):
         """

module/webui/lang.py

@@ -59,7 +59,4 @@ def reload():
 
     for key in dic_lang["ja-JP"].keys():
         if dic_lang["ja-JP"][key] == key:
-            dic_lang["ja-JP"][key] = dic_lang["en-US"][key]
-
-    global LANG
-    LANG = WebuiConfig().Language
+            dic_lang["ja-JP"][key] = dic_lang["en-US"][key]