From dd644b449ef082dfef44aa1d81ccbdea44d75851 Mon Sep 17 00:00:00 2001 From: memetrollsXD Date: Sun, 24 Apr 2022 01:57:28 +0200 Subject: [PATCH] Check commit description - Add Spanish and Dutch as languages - Replace "GrassCutter" with "GrassCutter" - Fix minor problem with package.json - Fix some potential terminology problems --- README.md | 2 +- languages/en.json | 8 ++++---- languages/es.json | 39 +++++++++++++++++++++++++++++++++++++++ languages/fr.json | 2 +- languages/id.json | 4 ++-- languages/nl.json | 39 +++++++++++++++++++++++++++++++++++++++ languages/pt-br.json | 6 +++--- languages/vie.json | 2 +- languages/zh.json | 6 +++--- package.json | 2 +- resources/index.html | 2 +- resources/js/index.js | 2 +- 12 files changed, 96 insertions(+), 18 deletions(-) create mode 100644 languages/es.json create mode 100644 languages/nl.json diff --git a/README.md b/README.md index b6fa6b6..2ce1c39 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Grasscutter launcher for easily switching between Official and Private servers * [x] Server IP input * [x] Fun fancy CSS styling n stuff (CoD: MW 2019-style vertical menu for choosing between official and private servers? [See this](https://charlieintel.com/wp-content/uploads/2020/11/MW-new-menu.png)) * [ ] Custom images for private server sections (anyone is welcome to submit a pull request to add some!) - * [ ] Optional username/password creation for servers before entering (not implemented in GrassCutter yet) + * [ ] Optional username/password creation for servers before entering (not implemented in Grasscutter yet) * [x] Kill switch script (optional) * [x] Automatically run `install.cmd` when opening for the first time * [ ] Fix Windows scaling issues? diff --git a/languages/en.json b/languages/en.json index c658846..4d9a21f 100644 --- a/languages/en.json +++ b/languages/en.json @@ -3,11 +3,11 @@ "appName": "GrassClipper", "playOfficial": "Play Official", - "playPrivate": "Play Private", + "playPrivate": "Play on Grasscutter", "launchLocalServer": "Launch Local Server", "genshinFolderSet": "Set \"Genshin Impact Game\" folder", - "grasscutterFileSet": "Set \"GrassCutter\" .jar file", + "grasscutterFileSet": "Set \"Grasscutter\" .jar file", "folderNotSet": "Not set", "ipPlaceholder": "IP Address", @@ -20,7 +20,7 @@ "proxyOption": "Proxy", "proxySubtitle": "Install the proxy server via the install script", "updateOption": "Update", - "updateSubtitle": "Auto updating is temporarily disabled. Check GitHub for the newest releease.", + "updateSubtitle": "Auto updating is temporarily disabled. Check GitHub for the newest release.", "languageOption": "Language", "languageSubtitle": "Select your language!", "enableServerLauncherOption": "Enable Server Launcher", @@ -35,5 +35,5 @@ "proxyInstallDeny": "No thanks", "genshinFolderDialog": "Select Genshin Impact Game folder", - "grasscutterFileDialog": "Select GrassCutter server jar file" + "grasscutterFileDialog": "Select Grasscutter server jar file" } diff --git a/languages/es.json b/languages/es.json new file mode 100644 index 0000000..72119a9 --- /dev/null +++ b/languages/es.json @@ -0,0 +1,39 @@ +{ + "fullLangName": "Español", + "appName": "GrassClipper", + + "playOfficial": "Jugar en oficial", + "playPrivate": "Jugar en Grasscutter", + "launchLocalServer": "Iniciar servidor local", + + "genshinFolderSet": "Establece el folder \"Genshin Impact Game\"", + "grasscutterFileSet": "Establece el archivo .jar de \"Grasscutter\"", + "folderNotSet": "No establecido", + + "ipPlaceholder": "Dirección IP", + "noFavorites": "No hay favoritos", + + "settingsTitle": "Ajustes", + "scriptsSectionTitle": "Scripts", + "killswitchOption": "Kill Switch", + "killswitchSubtitle": "Solo para aquellos muy paranoicos con bans. Cierra el proceso del juego *y tu Internet* si algo le sucede al proxy.", + "proxyOption": "Proxy", + "proxySubtitle": "Instale el servidor proxy a través del script de instalación", + "updateOption": "Update", + "updateSubtitle": "Las actualizaciónes automáticas están deshabilitadas temporalmente. Consulte GitHub para ver la versión más reciente.", + "languageOption": "Idioma", + "languageSubtitle": "Seleccióne su idioma!", + "enableServerLauncherOption": "Habilita el launcher del servidor", + "enableServerLauncherSubtitle": "Habilite el tile del launche del servidor para iniciar una instancia local de Grasscutter.", + + "introSen1": "¡Parece que es la primera vez que abres GrassClipper!", + "introSen2": "En primer lugar, ¡bienvenido, feliz de verte por aquí! :)", + "introSen3": "Quieres ejecutar el instalador de proxy?", + "introSen4": "(necesario para conectarse a los servidores)", + + "proxyInstallBtn": "Instalar", + "proxyInstallDeny": "No gracias", + + "genshinFolderDialog": "Selecciona la carpeta Genshin Impact game", + "grasscutterFileDialog": "Selecciona el archivo .jar de Grasscutter" +} diff --git a/languages/fr.json b/languages/fr.json index de1ac42..4ee7bb1 100644 --- a/languages/fr.json +++ b/languages/fr.json @@ -7,7 +7,7 @@ "launchLocalServer": "Lancer le serveur en local", "genshinFolderSet": "Définir le dossier \"Genshin Impact Game\"", - "grasscutterFileSet": "Définir le fichier .jar \"GrassCutter\"", + "grasscutterFileSet": "Définir le fichier .jar \"Grasscutter\"", "folderNotSet": "Pas encore défini", "ipPlaceholder": "Adresse IP", diff --git a/languages/id.json b/languages/id.json index d8ca49c..e29c7b6 100644 --- a/languages/id.json +++ b/languages/id.json @@ -7,7 +7,7 @@ "launchLocalServer": "Luncurkan Local Server", "genshinFolderSet": "Atur folder \"Genshin Impact Game\"", - "grasscutterFileSet": "Atur file \"GrassCutter\" .jar", + "grasscutterFileSet": "Atur file \"Grasscutter\" .jar", "folderNotSet": "Belum diatur", "ipPlaceholder": "Alamat IP", @@ -35,5 +35,5 @@ "proxyInstallDeny": "Tidak terima kasih", "genshinFolderDialog": "Pilih folder Genshin Impact Game", - "grasscutterFileDialog": "Pilih file jar server GrassCutter" + "grasscutterFileDialog": "Pilih file jar server Grasscutter" } \ No newline at end of file diff --git a/languages/nl.json b/languages/nl.json new file mode 100644 index 0000000..b88c2c7 --- /dev/null +++ b/languages/nl.json @@ -0,0 +1,39 @@ +{ + "fullLangName": "English", + "appName": "GrassClipper", + + "playOfficial": "Normaal spelen", + "playPrivate": "Op Grasscutter spelen", + "launchLocalServer": "Lokale server starten", + + "genshinFolderSet": "Selecteer de \"Genshin Impact Game\" folder", + "grasscutterFileSet": "Selecteer het \"Grasscutter\" .jar bestand", + "folderNotSet": "Niet geselecteerd", + + "ipPlaceholder": "IP adres", + "noFavorites": "Geen favorieten", + + "settingsTitle": "Instellingen", + "scriptsSectionTitle": "Scripts", + "killswitchOption": "Kill Switch", + "killswitchSubtitle": "Alleen voor de paranoïde gebruikers. Als iets met de proxy gebeurt, sluit dit jouw spel *en je internet* af.", + "proxyOption": "Proxy", + "proxySubtitle": "Installeer de proxy server via de installeer script", + "updateOption": "Update", + "updateSubtitle": "Automatisch updaten is tijdelijk uitgeschakeld. Ga naar de GitHub voor de nieuwste release.", + "languageOption": "Taal", + "languageSubtitle": "Selecteer je taal!", + "enableServerLauncherOption": "Server Launcher inschakelen", + "enableServerLauncherSubtitle": "Schakel dit in om de server launcher tile te gebruiken om een lokale Grasscutter server te starten.", + + "introSen1": "Het lijkt erop dat het de eerste keer is dat je Grasscutter gebruikt!", + "introSen2": "Ten eerste, welkom, goed om jou hier te zien! :)", + "introSen3": "Wil je de proxy installer uitvoeren?", + "introSen4": "(vereist om te verbinden naar servers)", + + "proxyInstallBtn": "Installeren", + "proxyInstallDeny": "Nee dank je", + + "genshinFolderDialog": "Selecteer de Genshin Impact Game folder", + "grasscutterFileDialog": "Selecteer het Grasscutter server jar bestand" +} diff --git a/languages/pt-br.json b/languages/pt-br.json index 5a16707..fe64647 100644 --- a/languages/pt-br.json +++ b/languages/pt-br.json @@ -7,7 +7,7 @@ "launchLocalServer": "Abrir Servidor Local", "genshinFolderSet": "Definir a pasta: \"Genshin Impact Game\" ", - "grasscutterFileSet": "Definir o arquivo .jar de \"GrassCutter\" ", + "grasscutterFileSet": "Definir o arquivo .jar de \"Grasscutter\" ", "folderNotSet": "Não Definida", "ipPlaceholder": "Endereço Ip", @@ -24,7 +24,7 @@ "languageOption": "Idioma", "languageSubtitle": "Selecione seu idioma!", "enableServerLauncherOption": "Permitir ao launcher ligar o servidor", - "enableServerLauncherSubtitle": "Permitir ao launcher iniciar uma instancia local do GrassCutter", + "enableServerLauncherSubtitle": "Permitir ao launcher iniciar uma instancia local do Grasscutter", "introSen1": "Parece que essa é a sua primeira vez usando o GrassClipper!", "introSen2": "Primeiramente, bem-vindo, estou feliz de te ver aqui! :)", @@ -35,5 +35,5 @@ "proxyInstallDeny": "Não obrigado", "genshinFolderDialog": "Selecione a pasta Genshin Impact Game", - "grasscutterFileDialog": "Selecione o arquivo jar do GrassCutter" + "grasscutterFileDialog": "Selecione o arquivo jar do Grasscutter" } \ No newline at end of file diff --git a/languages/vie.json b/languages/vie.json index d9c6cca..521c135 100644 --- a/languages/vie.json +++ b/languages/vie.json @@ -7,7 +7,7 @@ "launchLocalServer": "Khởi động Grasscutter", "genshinFolderSet": "Chỉnh địa điểm thư mục \"Genshin Impact Game\"", - "grasscutterFileSet": "Chỉnh địa điểm file \"GrassCutter\"", + "grasscutterFileSet": "Chỉnh địa điểm file \"Grasscutter\"", "folderNotSet": "Chưa chỉnh file", "ipPlaceholder": "Địa chỉ IP", diff --git a/languages/zh.json b/languages/zh.json index 1a3b1b4..39cd328 100644 --- a/languages/zh.json +++ b/languages/zh.json @@ -7,8 +7,8 @@ "launchLocalServer": "启动本地服务器", "genshinFolderSet": "选择 \"原神\" 文件夹", - "grasscutterFileSet": "选择 \"GrassCutter\" .jar 文件", - "folderNotSet": "没有设置原神文件夹或GrassCutter文件", + "grasscutterFileSet": "选择 \"Grasscutter\" .jar 文件", + "folderNotSet": "没有设置原神文件夹或Grasscutter文件", "ipPlaceholder": "IP地址", "noFavorites": "没有收藏", @@ -35,5 +35,5 @@ "proxyInstallDeny": "不用了，谢谢", "genshinFolderDialog": "选择原神文件夹", - "grasscutterFileDialog": "选择GrassCutter服务器jar文件" + "grasscutterFileDialog": "选择Grasscutter服务器jar文件" } diff --git a/package.json b/package.json index 2612e1b..66eb121 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "GrassClipper", + "name": "grassclipper", "version": "0.6.4", "repository": "https://github.com/Grasscutters/GrassClipper.git", "author": "SpikeHD ", diff --git a/resources/index.html b/resources/index.html index 9766e00..f7cb4d1 100644 --- a/resources/index.html +++ b/resources/index.html @@ -118,7 +118,7 @@
- +
diff --git a/resources/js/index.js b/resources/js/index.js index 128377b..a3f9dc8 100644 --- a/resources/js/index.js +++ b/resources/js/index.js @@ -562,7 +562,7 @@ async function setGenshinImpactFolder() { enableButtons() } -async function setGrassCutterFolder() { +async function setGrasscutterFolder() { const folder = await Neutralino.os.showOpenDialog(localeObj.grasscutterFileDialog, { filters: [ { name: 'Jar files', extensions: ['jar'] }