修复多语言支持的小bug

This commit is contained in:
MrZ626
2020-11-02 01:25:27 +08:00
parent a01727f754
commit ab82271fd0
8 changed files with 12 additions and 12 deletions

View File

@@ -535,7 +535,7 @@ return{
reset3="Reset all",
},
},
modes={
modes={fullCopy=true,
["sprint_10"]= {"Sprint", "10L", "Clear 10 lines!"},
["sprint_20"]= {"Sprint", "20L", "Clear 20 lines!"},
["sprint_40"]= {"Sprint", "40L", "Clear 40 lines!"},
@@ -621,7 +621,7 @@ return{
["sprintPenta"]= {"Sprint", "PENTOMINO", "Clear 40 lines with 18 pentominoes."},
["sprintMPH"]= {"Sprint", "MPH", "Memoriyless\nPreviewless\nHoldless"},
},
getTip={noMerge=true,
getTip={fullCopy=true,
'Free block game with Battle Royale mode!',
'Have you noticed what "rotating" does do to the block?',
":pog:",

View File

@@ -539,7 +539,7 @@ return{
reset3="Tout réinitialiser",
},
},
modes={
modes={fullCopy=true,
["sprint_10"]= {"Sprint", "10L", "Nettoyez 10 lignes !"},
["sprint_20"]= {"Sprint", "20L", "Nettoyez 20 lignes !"},
["sprint_40"]= {"Sprint", "40L", "Nettoyez 40 lignes !"},

View File

@@ -538,7 +538,7 @@ return{
reset3="Reiniciar todo",
},
},
modes={
modes={fullCopy=true,
["sprint_10"]= {"Sprint", "10L", "¡Limpia 10 líneas!"},
["sprint_20"]= {"Sprint", "20L", "¡Limpia 20 líneas!"},
["sprint_40"]= {"Sprint", "40L", "¡Limpia 40 líneas!"},

View File

@@ -436,7 +436,7 @@ return{
tapFX="动画",
},
},
modes={
modes={fullCopy=true,
["sprint_10"]= {"竞速", "10L", "消10行"},
["sprint_20"]= {"竞速", "20L", "消20行"},
["sprint_40"]= {"竞速", "40L", "消40行"},
@@ -522,7 +522,7 @@ return{
["sprintPenta"]= {"竞速", "五连块", "离谱"},
["sprintMPH"]= {"竞速", "纯净", "听说你反应很快?"},
},
getTip={noMerge=true,
getTip={fullCopy=true,
"100apm?你倒是不用开局定式连续打几把",
"10连pc不是随手?",
"20G很难?是个人都能玩吧。",

View File

@@ -118,7 +118,7 @@ return{
"全/半清:",
"多余操作/极简率:",
},
help={
help={fullCopy=true,
"既然你能玩到这个游戏,应该也不需要什么帮助吧?",
"这只是一个普通的方块游戏,请勿称此游戏为某某某方块",
"从TO/C2/KOS/TGM3/JS等方块获得过灵感",
@@ -537,7 +537,7 @@ return{
reset3="清空所有数据",
},
},
modes={
modes={fullCopy=true,
["sprint_10"]= {"竞速", "10L", "消除10行"},
["sprint_20"]= {"竞速", "20L", "消除20行"},
["sprint_40"]= {"竞速", "40L", "消除40行"},
@@ -623,7 +623,7 @@ return{
["sprintPenta"]= {"竞速", "五连块", "伤脑筋十八块"},
["sprintMPH"]= {"竞速", "MPH", "纯随机\n无预览\n无暂存"},
},
getTip={noMerge=true,
getTip={fullCopy=true,
'注意到"旋转"到底对方块做了些什么吗?',
"(RUR'U')R'FR2U'R'U'(RUR'F')",
"↑↑↓↓←→←→BA",

View File

@@ -111,7 +111,7 @@ return{
pong="弹球",
},
},
modes={
modes={fullCopy=true,
["sprint_10"]= {"竞速", "10行", "消除10行"},
["sprint_20"]= {"竞速", "20行", "消除20行"},
["sprint_40"]= {"竞速", "40行", "消除40行"},

View File

@@ -43,7 +43,7 @@ local publicWidgetText={
}
local function langFallback(T0,T)
for k,v in next,T0 do
if type(v)=="table"and not v.noMerge then--noMerge=true : copy pointer instead of content
if type(v)=="table"and not v.fullCopy then--fullCopy=true : copy pointer instead of content
if not T[k]then T[k]={}end
if type(T[k])=="table"and not v[1]then langFallback(v,T[k])end
elseif not T[k]then

View File

@@ -8,7 +8,7 @@ local ins,rem=table.insert,table.remove
local find,sub=string.find,string.sub
function sceneInit.dict()
local location=(SETTING.lang==3 or SETTING.lang==4)and"en"or"zh"
local location=({"zh","zh","en","en","en","en","zh"})[SETTING.lang]
sceneTemp={
dict=require("LANG/dict_"..location),