From 2ba25014c6011961bec9376e51a410fccc1bd037 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Mon, 18 Oct 2021 16:33:50 +0800 Subject: [PATCH] =?UTF-8?q?utf8=E8=A7=A3=E7=A0=81=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E5=90=8E=E4=BC=9A=E6=8F=90=E7=A4=BAwindows=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8D=A2=E4=B8=80=E4=B8=AA=E6=B8=B8=E6=88=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/init.lua | 6 +++++- parts/language/lang_en.lua | 1 + parts/language/lang_es.lua | 1 + parts/language/lang_fr.lua | 1 + parts/language/lang_pt.lua | 1 + parts/language/lang_symbol.lua | 2 -- parts/language/lang_zh.lua | 1 + parts/language/lang_zh3.lua | 3 ++- 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Zframework/init.lua b/Zframework/init.lua index 103415b7..8a978e1b 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -374,7 +374,11 @@ local function secondLoopThread() repeat yield()until mainLoop() end function love.errorhandler(msg) - if not msg then msg="Unknown error" end + if type(msg)~='string'then + msg="Unknown error" + elseif msg:find("Invaild UTF-8")and text then + msg=text.tryAnotherBuild + end --Generate error message local err={"Error:"..msg} diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 674f84ca..562049cd 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -126,6 +126,7 @@ return{ keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete", errorMsg="Techmino ran into a problem and needs to restart.\nYou can send the error log to the developers.", + tryAnotherBuild="[Invalid UTF-8] If you are on Windows, try downloading Techmino-win32 or Techmino-win64 (different from what you are using now).", modInstruction="Choose your modifiers!\nMods allow you to change the game,\nbut they may also crash the game.\nScores will not be saved when using mods.", modInfo={ diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 717ce8d5..0bb932f0 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -116,6 +116,7 @@ return{ -- keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete", errorMsg="Ha ocurrido un error y Techmino necesita reiniciarse.\nSe creó un registro de error, puedes enviarlo al autor.", + -- tryAnotherBuild="[Invalid UTF-8] If you are on Windows, try downloading Techmino-win32 or Techmino-win64 (different from what you are using now).", -- modInstruction="", -- modInfo={},--See lang_en.lua diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index ceac1630..b502978d 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -117,6 +117,7 @@ return{ -- keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete", errorMsg="Une erreur est survenue et Techmino doit redémarrer.\nDes informations concernant l'erreur ont été créées, et vous pouvez les envoyer au créateur.", + -- tryAnotherBuild="[Invalid UTF-8] If you are on Windows, try downloading Techmino-win32 or Techmino-win64 (different from what you are using now).", modInstruction="", modInfo={},-- See lang_en.lua diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index d7aecd9b..3a772fd6 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -115,6 +115,7 @@ return{ -- keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete", errorMsg="Um erro ocorreu e Techmino precisa reiniciar.\nInformação do erro foi criada, e você pode mandar ao autor.", + -- tryAnotherBuild="[Invalid UTF-8] If you are on Windows, try downloading Techmino-win32 or Techmino-win64 (different from what you are using now).", modInstruction="Selecione mods (modificadores) para usar!\nMods irão modificar o jogo em formas diferentes\n(e possivelmente quebrar o jogo de formas estranhas).\nAlguns mods irão fazer seu jogo unranked.", modInfo={ diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 0d4fb928..89658a30 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -64,8 +64,6 @@ return{ replayBroken=">x.", - errorMsg="T&chm1n0 ^@n 1nt0 @ p^0bl&m @nd n&&d$ t0 ^&$t@^t.\nY0u c@n $&nd th& &^^0^ l0g t0 th& d&v$.", - pauseStat={ "~:", "=/''/[ ]:", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 0c21b22d..67c880ea 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -126,6 +126,7 @@ return{ keySettingInstruction="点击添加键位绑定\nesc取消选中\n退格键清空选中", errorMsg="Techmino遭受了雷击,需要重新启动.\n我们已收集了一些错误信息,你可以向作者进行反馈.", + tryAnotherBuild="[解码UTF-8错误] 如果你现在用的是Windows系统,请重新下载 Techmino-32位 或者 Techmino-64位 (和现在运行的不一样的那个).", modInstruction="选择你要使用的Mod!\n不同Mod会用不同的方式改变初始游戏规则(可能导致不能正常游玩)\n来开发新玩法或者挑战自我吧!\n提醒:开启一些Mod会让成绩无效,你也可以用键盘开关Mod,按住shift反向", modInfo={ diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index dcc379c5..0a40db43 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -127,6 +127,7 @@ return{ keySettingInstruction="按绑定键\n退出:取消\n退格:删除", errorMsg="技术米诺遇到问题,需要重新启动。\n您可以将错误日志发送给开发人员。", + tryAnotherBuild="[无效UTF-8]如果您在Windows上,请尝试下载Techmino-win32或Techmino-win64(与您现在使用的不同)", modInstruction="选择你的修改器\n多重器官衰竭允许您更改游戏。\n它们也可能以奇怪的方式破坏游戏。\n请注意,多重器官衰竭将导致您的游戏取消排名!", modInfo={ @@ -772,7 +773,7 @@ return{ "1下一个1等待!", "1下一个6等待!", "20克实际上是一个全新的游戏规则", - "40直线冲刺世界纪录:14.915秒,重置_", + "40直线冲刺世界纪录:14.915秒,重置_", "6下一个1等待!", "6下一个6等一下?!", "成就系统即将推出!",