diff --git a/languages/en.json b/languages/en.json index 538e68c..95b9965 100644 --- a/languages/en.json +++ b/languages/en.json @@ -79,5 +79,7 @@ "stableInstall": "Download", "devInstall": "Download", - "updateNotifText": "A new update is available! Newest version: " + "updateNotifText": "A new update is available! Newest version: ", + + "chineseCharacterAlert": "The file path set contains Chinese characters, this may cause problems!" } diff --git a/resources/js/helpers.js b/resources/js/helpers.js index d732844..21c9a13 100644 --- a/resources/js/helpers.js +++ b/resources/js/helpers.js @@ -92,7 +92,7 @@ async function openLatestDownload() { async function openGameFolder() { const config = await getCfg() const folder = config.gameexe.match(/.*\\|.*\//g, '') - + if (folder.length > 0) openInExplorer(folder[0]) } @@ -105,8 +105,8 @@ async function openGrasscutterFolder() { // https://www.jimzhao.us/2015/09/javascript-detect-chinese-character.html function hasChineseChars(str) { - let re1 = new RegExp(/^[\u4E00-\uFA29]*$/) //Chinese character range - let re2 = new RegExp(/^[\uE7C7-\uE7F3]*$/) //non Chinese character range + let re1 = new RegExp(/[\u4E00-\uFA29]/) //Chinese character range + let re2 = new RegExp(/[\uE7C7-\uE7F3]/) //non Chinese character range str = str.replace(/\s/g, '') if (!re1.test(str) || re2.test(str)) { diff --git a/resources/js/index.js b/resources/js/index.js index 911cdcc..87e0f47 100644 --- a/resources/js/index.js +++ b/resources/js/index.js @@ -411,6 +411,7 @@ async function setGameExe() { }) if (!gameExe[0]) return + if (hasChineseChars(gameExe[0])) displayAlert(localeObj.chineseCharacterAlert) // Set the folder in our configuration const config = await getCfg() @@ -434,6 +435,7 @@ async function setGrasscutterFolder() { }) if (!folder[0]) return + if (hasChineseChars(folder[0])) displayAlert(localeObj.chineseCharacterAlert) // Set the folder in our configuration const config = await getCfg()