From 6a6cf1e3ab6ad35b1d03c8ce1fb64085c264f5db Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 20 Jan 2021 22:40:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=8A=A0=E8=91=A1?= =?UTF-8?q?=E8=90=84=E7=89=99=E8=AF=AD=E5=90=8E=E5=BC=80yygq=E8=BF=9B?= =?UTF-8?q?=E8=AF=8D=E5=85=B8=E4=BC=9A=E6=8A=A5=E9=94=99=E5=B9=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E8=AF=AD=E8=A8=80=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/languages.lua | 1 - main.lua | 2 +- parts/scenes/dict.lua | 3 +-- parts/scenes/lang.lua | 12 ++++++------ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Zframework/languages.lua b/Zframework/languages.lua index d55b9e78..6cec67ce 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -1,4 +1,3 @@ -local lang = require "parts.scenes.lang" local langList,publicText={},{} local LANG={} diff --git a/main.lua b/main.lua index 3099c424..f51868dc 100644 --- a/main.lua +++ b/main.lua @@ -207,12 +207,12 @@ VOC.init{ LANG.setLangList{ require"parts/language/lang_zh", require"parts/language/lang_zh2", + require"parts/language/lang_yygq", require"parts/language/lang_en", require"parts/language/lang_fr", require"parts/language/lang_sp", require"parts/language/lang_pt", require"parts/language/lang_symbol", - require"parts/language/lang_yygq", --1. Add language file to LANG folder; --2. Require it; --3. Add a button in parts/scenes/setting_lang.lua; diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index 2d49c828..d3e30c99 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -20,8 +20,7 @@ local lastSearch--Last searched string function scene.sceneInit() BG.set("rainbow") - local location=({"zh","zh","en","en","en","en","zh"})[SETTING.lang] - dict=require("parts/language/dict_"..location) + dict=require("parts/language/dict_"..({"zh","zh","zh","en","en","en","en","en"})[SETTING.lang]) input="" result={} diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index abbb015c..d54c6e9b 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -8,12 +8,12 @@ local function setLang(n)return function()SETTING.lang=n LANG.set(n)end end scene.widgetList={ WIDGET.newButton{name="zh", x=200, y=100,w=200,h=120,fText="中文", font=35,code=setLang(1)}, WIDGET.newButton{name="zh2", x=420, y=100,w=200,h=120,fText="全中文", font=35,code=setLang(2)}, - WIDGET.newButton{name="en", x=640, y=100,w=200,h=120,fText="English", font=35,code=setLang(3)}, - WIDGET.newButton{name="fr", x=860, y=100,w=200,h=120,fText="Français", font=35,code=setLang(4)}, - WIDGET.newButton{name="sp", x=1080, y=100,w=200,h=120,fText="Español", font=35,code=setLang(5)}, - WIDGET.newButton{name="pt", x=200, y=250,w=200,h=120,fText="Português", font=35,code=setLang(6)}, - WIDGET.newButton{name="symbol", x=420, y=250,w=200,h=120,fText="?????", font=35,code=setLang(7)}, - WIDGET.newButton{name="yygq", x=640, y=250,w=200,h=120,fText="就这?", font=35,code=setLang(8)}, + WIDGET.newButton{name="yygq", x=640, y=100,w=200,h=120,fText="就这?", font=35,code=setLang(8)}, + WIDGET.newButton{name="en", x=860, y=100,w=200,h=120,fText="English", font=35,code=setLang(3)}, + WIDGET.newButton{name="fr", x=1080, y=100,w=200,h=120,fText="Français", font=35,code=setLang(4)}, + WIDGET.newButton{name="sp", x=200, y=250,w=200,h=120,fText="Español", font=35,code=setLang(5)}, + WIDGET.newButton{name="pt", x=420, y=250,w=200,h=120,fText="Português", font=35,code=setLang(6)}, + WIDGET.newButton{name="symbol", x=640, y=250,w=200,h=120,fText="?????", font=35,code=setLang(7)}, WIDGET.newButton{name="back", x=640, y=600,w=200,h=80,font=35,code=backScene}, }