修复增加葡萄牙语后开yygq进词典会报错并更改语言排序

This commit is contained in:
MrZ626
2021-01-20 22:40:58 +08:00
parent 851469b6a5
commit 6a6cf1e3ab
4 changed files with 8 additions and 10 deletions

View File

@@ -1,4 +1,3 @@
local lang = require "parts.scenes.lang"
local langList,publicText={},{}
local LANG={}

View File

@@ -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;

View File

@@ -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={}

View File

@@ -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},
}