From 27d30a183c3bf82492508dc29334ef2858467976 Mon Sep 17 00:00:00 2001 From: Thoronium <107363768+NotThorny@users.noreply.github.com> Date: Sun, 26 Feb 2023 16:54:36 -0700 Subject: [PATCH] Update languages Small fixes --- src-tauri/lang/cht.json | 5 +- src-tauri/lang/es.json | 1 + src-tauri/lang/fr.json | 10 +++- src-tauri/lang/id.json | 15 +++++- src-tauri/lang/lv.json | 8 +++- src-tauri/lang/nl.json | 4 +- src-tauri/lang/ru.json | 4 +- src/ui/components/menu/Downloads.tsx | 70 +++++++++++++++------------- src/ui/components/menu/Options.tsx | 2 + 9 files changed, 80 insertions(+), 39 deletions(-) diff --git a/src-tauri/lang/cht.json b/src-tauri/lang/cht.json index 0d047b8..ab9f5c9 100644 --- a/src-tauri/lang/cht.json +++ b/src-tauri/lang/cht.json @@ -14,6 +14,7 @@ "enabled": "已啟用", "disabled": "未啟用", "game_path": "選擇遊戲安裝路徑", + "game_command": "遊戲啟動命令", "game_executable": "選擇遊戲執行檔", "recover_metadata": "緊急恢復Metadata", "grasscutter_jar": "選擇伺服器JAR檔案", @@ -25,7 +26,9 @@ "background": "選擇自定義背景（網址或檔案）", "theme": "選擇主題", "patch_metadata": "自動修補Metadata", - "use_proxy": "使用內建代理伺服器" + "use_proxy": "使用內建代理伺服器", + "wipe_login": "擦除登錄緩存", + "horny_mode": "Horny模式" }, "downloads": { "grasscutter_fullbuild": "下載Grasscutter多合一下載", diff --git a/src-tauri/lang/es.json b/src-tauri/lang/es.json index 6759a7a..00c533d 100644 --- a/src-tauri/lang/es.json +++ b/src-tauri/lang/es.json @@ -14,6 +14,7 @@ "enabled": "Activado", "disabled": "Desactivado", "game_path": "Ruta de instalación del juego", + "game_command": "Comando de lanzamiento del juego", "game_executable": "Establecer ejecutable del juego", "recover_metadata": "Recuperación de Metadatos de Emergencia", "grasscutter_jar": "Establecer JAR de Grasscutter", diff --git a/src-tauri/lang/fr.json b/src-tauri/lang/fr.json index 1977021..b1250e4 100644 --- a/src-tauri/lang/fr.json +++ b/src-tauri/lang/fr.json @@ -13,14 +13,22 @@ "options": { "enabled": "active", "disabled": "desactiver", + "game_path": "Définir le chemin d'installation du jeu", + "game_command": "Commande de lancement du jeu", "game_executable": "definir l'executable du jeu", + "recover_metadata": "Récupération d'urgence des métadonnées", "grasscutter_jar": "definir le Jar Grasscutter", "toggle_encryption": "activer l'encryption", + "install_certificate": "Installer le certificat du proxy", "java_path": "definir un chemin java personnalise", "grasscutter_with_game": "Lancer Grasscutter automatiquement avec le jeu", "language": "Choisir la langue", "background": "definir un arriere plan personnalise (lien ou fichier image)", - "theme": "definir un theme" + "theme": "definir un theme", + "patch_metadata": "Corriger automatiquement les métadonnées", + "use_proxy": "Utiliser un proxy interne", + "wipe_login": "Effacer le cache de connexion", + "horny_mode": "Mode excitation" }, "downloads": { "grasscutter_fullbuild": "Telecharger Grasscutter tout-en-un", diff --git a/src-tauri/lang/id.json b/src-tauri/lang/id.json index 99f66f2..1a75025 100644 --- a/src-tauri/lang/id.json +++ b/src-tauri/lang/id.json @@ -10,13 +10,24 @@ "files_extracting": "MengExtract File: " }, "options": { - "game_executable": "Set Game Executable", + "enabled": "Diaktifkan", + "disabled": "Dinonaktifkan", + "game_path": "Mengatur jalur penginstalan game", + "game_command": "Perintah peluncuran game", + "game_executable": "Mengatur game yang dapat dieksekusi", + "recover_metadata": "Pemulihan metadata darurat", "grasscutter_jar": "Path ke Grasscutter JAR", + "toggle_encryption": "Alihkan enkripsi", + "install_certificate": "Instal sertifikat proxy", "java_path": "Atur kustom Java path", "grasscutter_with_game": "Otomatis Menjalankan Grasscutter Dengan Game", "language": "Pilih Bahasa", "background": "Atur Kustom Latar Belakang (link atau gambar file)", - "theme": "Atur Tema" + "theme": "Atur Tema", + "patch_metadata": "Automatically Patch Metadata", + "use_proxy": "Gunakan Proxy Internal", + "wipe_login": "Menghapus Cache Login", + "horny_mode": "Mode Terangsang" }, "downloads": { "grasscutter_fullbuild": "Sedang Mendownload Grasscutter Semua Dalam Satu", diff --git a/src-tauri/lang/lv.json b/src-tauri/lang/lv.json index a066b12..03b63dc 100644 --- a/src-tauri/lang/lv.json +++ b/src-tauri/lang/lv.json @@ -14,13 +14,19 @@ "enabled": "Iespējots", "disabled": "Atspējots", "game_executable": "Iestatīt spēles izpildāmu", + "recover_metadata": "Avārijas metadatu atjaunošana", "grasscutter_jar": "Iestatiet Grasscutter JAR", "toggle_encryption": "Pārslēgt Šifrēšanu", + "install_certificate": "Proxy sertifikāta instalēšana", "java_path": "Iestatiet pielāgotu Java ceļu", "grasscutter_with_game": "Automātiski palaidiet Grasscutter ar spēli", "language": "Izvēlēties valodu", "background": "Iestatīt pielāgotu fonu (saite vai attēla fails)", - "theme": "Iestatīt tēmu" + "theme": "Iestatīt tēmu", + "patch_metadata": "Automātiski ielāpot metadatus", + "use_proxy": "Izmantot iekšējo starpniekserveri", + "wipe_login": "Noslaucīt pieteikšanās kešatmiņu", + "horny_mode": "Uzbudināts režīms" }, "downloads": { "grasscutter_fullbuild": "Lejupielādējiet Grasscutter viss vienā", diff --git a/src-tauri/lang/nl.json b/src-tauri/lang/nl.json index aa07b69..55467a1 100644 --- a/src-tauri/lang/nl.json +++ b/src-tauri/lang/nl.json @@ -25,7 +25,9 @@ "background": "Aangepaste Achtergrond Instellen (link of afbeeldingsbestand)", "theme": "Thema instellen", "patch_metadata": "Metadata Automatisch Bijwerken", - "use_proxy": "Gebruik Interne Proxy" + "use_proxy": "Gebruik Interne Proxy", + "wipe_login": "Login cache wissen", + "horny_mode": "Geile modus" }, "downloads": { "grasscutter_fullbuild": "Grasscutter Alles-in-één Downloaden", diff --git a/src-tauri/lang/ru.json b/src-tauri/lang/ru.json index 05dd60f..f67d3d1 100644 --- a/src-tauri/lang/ru.json +++ b/src-tauri/lang/ru.json @@ -25,7 +25,9 @@ "background": "Установить свой фон (ссылка или файл)", "theme": "Установить тему", "patch_metadata": "Автоматический патч Метаданных при запуске", - "use_proxy": "Использовать встроенный Прокси" + "use_proxy": "Использовать встроенный Прокси", + "wipe_login": "Очистить кэш входа в систему", + "horny_mode": "роговой режим" }, "downloads": { "grasscutter_fullbuild": "Скачать все в одном Grasscutter", diff --git a/src/ui/components/menu/Downloads.tsx b/src/ui/components/menu/Downloads.tsx index 2dc2d8f..2e37991 100644 --- a/src/ui/components/menu/Downloads.tsx +++ b/src/ui/components/menu/Downloads.tsx @@ -172,6 +172,12 @@ export default class Downloads extends React.Component { async downloadResources() { const folder = await this.getGrasscutterFolder() this.props.downloadManager.addDownload(RESOURCES_DOWNLOAD, folder + '\\resources.zip', async () => { + + // Tell the user this takes some time + alert( + 'Extracting resources can take time! If your resources appear to be "stuck" extracting for less than 15-20 mins, they likely still are extracting.' + ) + // Delete the existing folder if it exists if ( await invoke('dir_exists', { @@ -216,24 +222,24 @@ export default class Downloads extends React.Component {
- +
-
- - -
-
- - - -
+
+ + +
+
+ + + +
@@ -256,24 +262,24 @@ export default class Downloads extends React.Component { */}
- +
-
- - -
-
- - - -
+
+ + +
+
+ + + +
{/*
diff --git a/src/ui/components/menu/Options.tsx b/src/ui/components/menu/Options.tsx index 7ec7c05..5e352b3 100644 --- a/src/ui/components/menu/Options.tsx +++ b/src/ui/components/menu/Options.tsx @@ -159,6 +159,8 @@ export default class Options extends React.Component { this.setState({ encryption: await translate(encEnabled ? 'options.enabled' : 'options.disabled'), }) + + window.location.reload() } setJavaPath(value: string) {