diff --git a/main.lua b/main.lua index 46225501..0d86fefe 100644 --- a/main.lua +++ b/main.lua @@ -317,13 +317,13 @@ VOC.init{ LANG.init('zh', { zh=require'parts.language.lang_zh', - zh2=require'parts.language.lang_zh2', + zh_full=require'parts.language.lang_zh_full', en=require'parts.language.lang_en', fr=require'parts.language.lang_fr', es=require'parts.language.lang_es', pt=require'parts.language.lang_pt', - grass=require'parts.language.lang_zh3', - yygq=require'parts.language.lang_yygq', + zh_grass=require'parts.language.lang_zh_grass', + zh_yygq=require'parts.language.lang_yygq', symbol=require'parts.language.lang_symbol', --1. Add language file to LANG folder; --2. Require it; diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index aaa7972c..a2cd9a5b 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -1,4 +1,4 @@ -return{ +return{fallback='zh', loadText={ loadSFX="音效", loadSample="乐器", diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh_full.lua similarity index 100% rename from parts/language/lang_zh2.lua rename to parts/language/lang_zh_full.lua diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh_grass.lua similarity index 100% rename from parts/language/lang_zh3.lua rename to parts/language/lang_zh_grass.lua diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index 38097a79..e856a756 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -1,13 +1,13 @@ local langList={ zh="中文", - zh2="全中文", + zh_full="全中文", en="English", fr="Français", es="Español", pt="Português", - grass="机翻", - yygq="就这?", + zh_grass="机翻", + zh_yygq="就这?", symbol="?????", } @@ -25,15 +25,15 @@ local function _setLang(lid) collectgarbage() end scene.widgetList={ - WIDGET.newButton{x=200,y=100,w=200,h=120,fText=langList.zh, color='R', font=35,code=function()_setLang('zh')end}, - WIDGET.newButton{x=420,y=100,w=200,h=120,fText=langList.zh2, color='dR',font=35,code=function()_setLang('zh2')end}, - WIDGET.newButton{x=640,y=100,w=200,h=120,fText=langList.en, color='N', font=35,code=function()_setLang('en')end}, - WIDGET.newButton{x=860,y=100,w=200,h=120,fText=langList.fr, color='lW',font=35,code=function()_setLang('fr')end}, - WIDGET.newButton{x=1080,y=100,w=200,h=120,fText=langList.es, color='O', font=35,code=function()_setLang('es')end}, - WIDGET.newButton{x=200,y=250,w=200,h=120,fText=langList.pt, color='Y', font=35,code=function()_setLang('pt')end}, - WIDGET.newButton{x=200,y=550,w=200,h=120,fText=langList.grass, color='lG',font=35,code=function()_setLang('grass')end}, - WIDGET.newButton{x=420,y=550,w=200,h=120,fText=langList.yygq, color='D', font=35,code=function()_setLang('yygq')end}, - WIDGET.newButton{x=640,y=550,w=200,h=120,fText=langList.symbol,color='dH',font=35,code=function()_setLang('symbol')end}, + WIDGET.newButton{x=200,y=100,w=200,h=120,fText=langList.zh, color='R', code=function()_setLang('zh')end}, + WIDGET.newButton{x=420,y=100,w=200,h=120,fText=langList.zh_full, color='dR',code=function()_setLang('zh_full')end}, + WIDGET.newButton{x=640,y=100,w=200,h=120,fText=langList.en, color='N', code=function()_setLang('en')end}, + WIDGET.newButton{x=860,y=100,w=200,h=120,fText=langList.fr, color='lW',code=function()_setLang('fr')end}, + WIDGET.newButton{x=1080,y=100,w=200,h=120,fText=langList.es, color='O', code=function()_setLang('es')end}, + WIDGET.newButton{x=200,y=250,w=200,h=120,fText=langList.pt, color='Y', code=function()_setLang('pt')end}, + WIDGET.newButton{x=200,y=550,w=200,h=120,fText=langList.zh_grass,color='lG',code=function()_setLang('zh_grass')end}, + WIDGET.newButton{x=420,y=550,w=200,h=120,fText=langList.zh_yygq, color='D', code=function()_setLang('zh_yygq')end}, + WIDGET.newButton{x=640,y=550,w=200,h=120,fText=langList.symbol, color='dH',code=function()_setLang('symbol')end}, WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, }