Skip to content

Commit 59ef878

Browse files
committed
fix(i18n): refine tasklistpane i18n
The current TaskListPane may not look different for Chinese users, but the grammar is not quite right for English users. My previous series of PRs did not address this aspect due to the associated hard coding of the i18n key. I believe that revisions in this aspect can further improve the experience of Indo-European speakers. All languages except Japanese are ready for this PR.
1 parent c0410c4 commit 59ef878

11 files changed

+53
-23
lines changed

Diff for: HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskListPane.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,23 @@ public void onRunning(Task<?> task) {
147147
} else if (task instanceof ModpackUpdateTask) {
148148
task.setName(i18n("modpack.update"));
149149
} else if (task instanceof CurseInstallTask) {
150-
task.setName(i18n("modpack.install", i18n("modpack.type.curse")));
150+
task.setName(i18n("modpack.installing.given", i18n("modpack.type.curse")));
151151
} else if (task instanceof MultiMCModpackInstallTask) {
152-
task.setName(i18n("modpack.install", i18n("modpack.type.multimc")));
152+
task.setName(i18n("modpack.installing.given", i18n("modpack.type.multimc")));
153153
} else if (task instanceof ModrinthInstallTask) {
154-
task.setName(i18n("modpack.install", i18n("modpack.type.modrinth")));
154+
task.setName(i18n("modpack.installing.given", i18n("modpack.type.modrinth")));
155155
} else if (task instanceof ServerModpackLocalInstallTask) {
156-
task.setName(i18n("modpack.install", i18n("modpack.type.server")));
156+
task.setName(i18n("install.installing") + ": " + i18n("modpack.type.server"));
157157
} else if (task instanceof HMCLModpackInstallTask) {
158-
task.setName(i18n("modpack.install", i18n("modpack.type.hmcl")));
158+
task.setName(i18n("modpack.installing.given", i18n("modpack.type.hmcl")));
159159
} else if (task instanceof McbbsModpackExportTask || task instanceof MultiMCModpackExportTask || task instanceof ServerModpackExportTask) {
160160
task.setName(i18n("modpack.export"));
161161
} else if (task instanceof MinecraftInstanceTask) {
162162
task.setName(i18n("modpack.scan"));
163163
} else if (task instanceof MojangJavaDownloadTask) {
164164
task.setName(i18n("download.java"));
165165
} else if (task instanceof JavaInstallTask) {
166-
task.setName(i18n("java.install"));
166+
task.setName(i18n("java.installing"));
167167
}
168168

169169
Platform.runLater(() -> {

Diff for: HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ private Task<Void> finishVersionDownloadingAsync(Map<String, Object> settings) {
294294

295295
@Override
296296
public Object finish(Map<String, Object> settings) {
297-
settings.put("title", i18n("install.new_game"));
297+
settings.put("title", i18n("install.new_game.installation"));
298298
settings.put("success_message", i18n("install.success"));
299299
settings.put("failure_callback", (FailureCallback) (settings1, exception, next) -> UpdateInstallerWizardProvider.alertFailureMessage(exception, next));
300300

Diff for: HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackInstallWizardProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private Task<?> finishModpackInstallingAsync(Map<String, Object> settings) {
120120

121121
@Override
122122
public Object finish(Map<String, Object> settings) {
123-
settings.put("title", i18n("install.modpack"));
123+
settings.put("title", i18n("install.modpack.installation"));
124124
settings.put("success_message", i18n("install.success"));
125125
settings.put("failure_callback", new FailureCallback() {
126126
@Override

Diff for: HMCL/src/main/java/org/jackhuang/hmcl/ui/download/UpdateInstallerWizardProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void start(Map<String, Object> settings) {
7171

7272
@Override
7373
public Object finish(Map<String, Object> settings) {
74-
settings.put("title", i18n("install.change_version"));
74+
settings.put("title", i18n("install.change_version.process"));
7575
settings.put("success_message", i18n("install.success"));
7676
settings.put("failure_callback", (FailureCallback) (settings1, exception, next) -> alertFailureMessage(exception, next));
7777

Diff for: HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VanillaInstallWizardProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private Task<Void> finishVersionDownloadingAsync(Map<String, Object> settings) {
6666

6767
@Override
6868
public Object finish(Map<String, Object> settings) {
69-
settings.put("title", i18n("install.new_game"));
69+
settings.put("title", i18n("install.new_game.installation"));
7070
settings.put("success_message", i18n("install.success"));
7171
settings.put("failure_callback", (FailureCallback) (settings1, exception, next) -> UpdateInstallerWizardProvider.alertFailureMessage(exception, next));
7272

Diff for: HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaDownloadDialog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ protected void onAccept() {
164164
}), i18n("download.java"), TaskCancellationAction.NORMAL);
165165
}, null);
166166
else
167-
Controllers.taskDialog(downloadTask(javaVersion), i18n("download.java"), TaskCancellationAction.NORMAL);
167+
Controllers.taskDialog(downloadTask(javaVersion), i18n("download.java.process"), TaskCancellationAction.NORMAL);
168168
}
169169
}
170170

Diff for: HMCL/src/main/resources/assets/lang/I18N.properties

+9-3
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ download.provider.balanced=From Fastest Available
340340
download.provider.mirror=From Mirror
341341
download.java=Downloading Java
342342
download.java.override=This Java version already exists. Do you want to uninstall and reinstall it?
343+
download.java.process=Java Download Process
343344
download.javafx=Downloading dependencies for the launcher...
344345
download.javafx.notes=We are currently downloading dependencies for HMCL from the Internet.\n\
345346
\n\
@@ -665,6 +666,7 @@ input.url=The input must be a valid URL.
665666
install=New Instance
666667
install.change_version=Change Version
667668
install.change_version.confirm=Are you sure you want to switch %s from version %s to %s?
669+
install.change_version.process=Change Version Process
668670
install.failed=Failed to install
669671
install.failed.downloading=Failed to download some required files.
670672
install.failed.downloading.detail=Failed to download file: %s
@@ -684,7 +686,7 @@ install.installer.forge=Forge
684686
install.installer.neoforge=NeoForge
685687
install.installer.game=Minecraft
686688
install.installer.incompatible=Incompatible with %s
687-
install.installer.install=Install %s
689+
install.installer.install=Installing %s
688690
install.installer.install_offline=Install/Update from Local File
689691
install.installer.install_offline.extension=(Neo)Forge/OptiFine installer
690692
install.installer.install_offline.tooltip=We support using the local (Neo)Forge/OptiFine installer.
@@ -697,11 +699,14 @@ install.installer.quilt=Quilt
697699
install.installer.quilt-api=QSL/QFAPI
698700
install.installer.version=%s
699701
install.installer.external_version=%s (Installed by external process, which cannot be configured)
702+
install.installing=Installing
700703
install.modpack=Install Modpack
704+
install.modpack.installation=Modpack Installation
701705
install.name.invalid=The name contains non-ASCII characters (such as emoji or CJK characters).\nIt is recommended to change the name to include only English letters, numbers, and underscores to avoid potential issues when launching the game.\nDo you want to proceed with the installation?
702706
install.new_game=Install Instance
703707
install.new_game.already_exists=This instance name already exists. Please use another name.
704708
install.new_game.current_game_version=Current Instance Version
709+
install.new_game.installation=Instance Installation
705710
install.new_game.malformed=Invalid name.
706711
install.select=Choose operation
707712
install.success=Successfully installed.
@@ -733,6 +738,7 @@ java.install.failed.invalid=This archive is not a valid Java installation packag
733738
java.install.failed.unsupported_platform=This Java is not compatible with the current platform, so it cannot be installed.
734739
java.install.name=Name
735740
java.install.warning.invalid_character=Illegal character in name
741+
java.installing=Installing Java
736742
java.reveal=Reveal the Java directory
737743
java.uninstall=Uninstall Java
738744
java.uninstall.confirm=Are you sure you want to uninstall this Java? This action cannot be undone!
@@ -865,8 +871,8 @@ modpack.files.resourcepacks=Resource/Texture Packs
865871
modpack.files.saves=Game Saves
866872
modpack.files.scripts=MineTweaker Configuration File
867873
modpack.files.servers_dat=Server List File
868-
modpack.install=Install Modpack %s
869-
modpack.installing=Installing Modpack
874+
modpack.installing=Installing modpack
875+
modpack.installing.given=Installing %s modpack
870876
modpack.introduction=Curse, Modrinth, MultiMC, and MCBBS modpacks are currently supported.
871877
modpack.invalid=Invalid modpack, you can try downloading it again.
872878
modpack.mismatched_type=Modpack type mismatched, the current instance is a(n) %s type, but the provided one is %s type.

Diff for: HMCL/src/main/resources/assets/lang/I18N_es.properties

+9-3
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ download.provider.balanced=De la fuente más rápida disponible
340340
download.provider.mirror=Desde espejo
341341
download.java=Descargando Java
342342
download.java.override=Esta versión de Java ya existe. ¿Desea desinstalarla y volver a instalarla?
343+
download.java.process=Proceso de descarga Java
343344
download.javafx=Descargando dependencias para el launcher...
344345
download.javafx.notes=Estamos descargando dependencias para HMCL desde Internet.\n\
345346
\n\
@@ -612,6 +613,7 @@ input.url=La entrada debe ser una URL válida.
612613
install=Nueva instancia
613614
install.change_version=Cambiar versión
614615
install.change_version.confirm=¿Está seguro de querer cambiar %s de la versión %s a %s?
616+
install.change_version.process=Proceso de cambio de versión
615617
install.failed=Fallo en la instalación
616618
install.failed.downloading=No se han podido descargar algunos archivos necesarios.
617619
install.failed.downloading.detail=No se ha podido descargar el archivo: %s
@@ -631,7 +633,7 @@ install.installer.forge=Forge
631633
install.installer.neoforge=NeoForge
632634
install.installer.game=Minecraft
633635
install.installer.incompatible=Incompatible con %s
634-
install.installer.install=Instalar %s
636+
install.installer.install=Instalando %s
635637
install.installer.install_offline=Instalar/actualizar desde archivo local
636638
install.installer.install_offline.extension=Instalador de (Neo)Forge/OptiFine
637639
install.installer.install_offline.tooltip=Apoyamos el uso del instalador local de (Neo)Forge/OptiFine.
@@ -644,11 +646,14 @@ install.installer.quilt=Quilt
644646
install.installer.quilt-api=QSL/QFAPI
645647
install.installer.version=%s
646648
install.installer.external_version=%s (Instalado por un proceso externo, que no se puede configurar)
649+
install.installing=Instalando
647650
install.modpack=Añadir modpack
651+
install.modpack.installation=Instalación de modpack
648652
install.name.invalid=El nombre contiene caracteres no ASCII (como emoji o caracteres CJK).\n\nSe recomienda cambiar el nombre para que sólo incluya letras, números y guiones bajos en inglés para evitar posibles problemas al iniciar el juego.\n\n¿Desea continuar con la instalación?
649653
install.new_game=Añadir instancia
650654
install.new_game.already_exists=Esta instancia ya existe. Por favor, utilice otro nombre.
651655
install.new_game.current_game_version=Versión actual de la instancia
656+
install.new_game.installation=Instalación de instancia
652657
install.new_game.malformed=Nombre no válido.
653658
install.select=Elegir una operación
654659
install.success=Instalado con éxito.
@@ -680,6 +685,7 @@ java.install.failed.invalid=Este archivo no es un paquete de instalación de Jav
680685
java.install.failed.unsupported_platform=Este Java no es compatible con la plataforma actual, por lo que no puede instalarse.
681686
java.install.name=Nombre
682687
java.install.warning.invalid_character=Carácter ilegal en el nombre
688+
java.installing=Instalando Java
683689
java.reveal=Revelar el directorio de Java
684690
java.uninstall=Desinstalar Java
685691
java.uninstall.confirm=¿Está seguro de que desea desinstalar este Java? ¡Esta acción no se puede deshacer!
@@ -812,8 +818,8 @@ modpack.files.resourcepacks=Paquetes de recursos/texturas
812818
modpack.files.saves=Mundos de juego
813819
modpack.files.scripts=Archivo de configuración de MineTweaker
814820
modpack.files.servers_dat=Archivo de lista de servidores
815-
modpack.install=Instalar Modpack %s
816-
modpack.installing=Instalando Modpack
821+
modpack.installing=Instalando modpack
822+
modpack.installing.given=Instalando %s modpack
817823
modpack.introduction=Actualmente se soportan los modpacks CurseForge, Modrinth, MultiMC y MCBBS.
818824
modpack.invalid=Modpack inválido, puede intentar volver a descargarlo.
819825
modpack.mismatched_type=Tipo de modpack erróneo, la instancia actual es del tipo %s, pero la proporcionada es del tipo %s.

Diff for: HMCL/src/main/resources/assets/lang/I18N_ru.properties

+8-2
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ download.provider.official=Из официальных источников
314314
download.provider.balanced=Из самых быстрых доступных
315315
download.provider.mirror=Из зеркала
316316
download.java=Скачивание Java
317+
download.java.process=Процесс скачивания Java
317318
download.javafx=Скачивание зависимостей лаунчера...
318319
download.javafx.notes=Скачиваем зависимостей лаунчера из интернета.\n\
319320
\n\
@@ -442,6 +443,7 @@ input.url=Ввод должен быть действительным URL-адр
442443
install=Новый экземпляр
443444
install.change_version=Изменить версию
444445
install.change_version.confirm=Переключить %s с версии %s на %s?
446+
install.change_version.process=Процесс изменения версии
445447
install.failed=Сбой установки
446448
install.failed.downloading=Не удаётся скачать некоторые из необходимых файлов.
447449
install.failed.downloading.detail=Не удаётся скачать файл\: %s
@@ -472,10 +474,13 @@ install.installer.optifine=OptiFine
472474
install.installer.quilt=Quilt
473475
install.installer.quilt-api=QSL/QFAPI
474476
install.installer.version=%s
477+
install.installing=Установка
475478
install.modpack=Установить модпак
479+
install.modpack.installation=Установка модпак
476480
install.new_game=Добавить новый экземпляр
477481
install.new_game.already_exists=Экземпляр уже существует. Используйте другое имя.
478482
install.new_game.current_game_version=Текущая версия экземпляра
483+
install.new_game.installation=Установка экземпляра
479484
install.new_game.malformed=Недопустимое имя
480485
install.select=Выберите операцию
481486
install.success=Успешно установлено.
@@ -506,6 +511,7 @@ java.install.failed.invalid=Этот архив не является допус
506511
java.install.failed.unsupported_platform=Эта Java несовместима с текущей платформой, поэтому ее невозможно установить.
507512
java.install.name=Название
508513
java.install.warning.invalid_character=Неправильный символ в названии
514+
java.installing=Установка Java
509515
java.reveal=Откройте каталог Java
510516
java.uninstall=Удалить Java
511517
java.uninstall.confirm=Вы уверены, что хотите удалить эту Java? Это действие нельзя отменить!
@@ -627,8 +633,8 @@ modpack.files.resourcepacks=Текстурпаки
627633
modpack.files.saves=Сохранения игры
628634
modpack.files.scripts=Файл конфигурации MineTweaker
629635
modpack.files.servers_dat=Файл списка серверов
630-
modpack.install=Установить модпак %s
631-
modpack.installing=Установка модпака
636+
modpack.installing=Установка модпак
637+
modpack.installing.given=Установка модпак %s
632638
modpack.introduction=Поддерживаются модпаки CurseForge, Modrinth, MultiMC и MCBBS.
633639
modpack.invalid=Неверный модпак, попробуйте скачать его заново.
634640
modpack.mismatched_type=Несоответствие типа модпака, текущий экземпляр имеет тип %s, но предоставленный экземпляр имеет тип %s.

Diff for: HMCL/src/main/resources/assets/lang/I18N_zh.properties

+8-2
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ download.provider.balanced=選取載入速度快的下載源 (平衡,但可能
340340
download.provider.mirror=盡量使用鏡像源 (載入快,但可能不是最新)
341341
download.java=下載 Java
342342
download.java.override=此 Java 版本已經存在,是否移除並重新安裝?
343+
download.java.process=下載 Java
343344
download.javafx=正在下載必要的執行時元件
344345
download.javafx.notes=正在透過網路下載 HMCL 必要的執行時元件。\n點擊「切換下載源」按鈕查看詳情以及選取下載源,點擊「取消」按鈕停止並退出。\n注意:如果下載速度過慢,請嘗試切換下載源。
345346
download.javafx.component=正在下載元件「%s」
@@ -479,6 +480,7 @@ input.url=必須是有效連結
479480
install=新增實例
480481
install.change_version=變更版本
481482
install.change_version.confirm=你確定要將 %s 從 %s 更新到 %s 嗎?
483+
install.change_version.process=變更版本
482484
install.failed=安裝失敗
483485
install.failed.downloading=安裝失敗,部分檔案未能完成下載
484486
install.failed.downloading.detail=未能下載檔案: %s
@@ -511,11 +513,14 @@ install.installer.quilt=Quilt
511513
install.installer.quilt-api=QSL/QFAPI
512514
install.installer.version=%s
513515
install.installer.external_version=%s [由外部安裝的版本,無法解除安裝或更換]
516+
install.installing=安裝
514517
install.modpack=安裝模組包
518+
install.modpack.installation=安裝模組包
515519
install.name.invalid=名稱中包含非 ASCII 字元(如 Emoji 表情或中文字元)。\n建議修改名稱,名稱建議僅包含英文字母、數字和底線,以防啟動遊戲時出現問題。是否繼續安裝?
516520
install.new_game=安裝新實例
517521
install.new_game.already_exists=此實例已經存在,請重新命名
518522
install.new_game.current_game_version=目前遊戲版本
523+
install.new_game.installation=安裝新實例
519524
install.new_game.malformed=名稱無效
520525
install.select=請選取安裝方式
521526
install.success=安裝成功
@@ -547,6 +552,7 @@ java.install.failed.invalid=該檔案不是合法的 Java 安裝包,無法繼
547552
java.install.failed.unsupported_platform=此 Java 與目前平臺不相容,無法安裝。
548553
java.install.name=名稱
549554
java.install.warning.invalid_character=名稱中包含無效字元
555+
java.installing=安裝 Java
550556
java.reveal=瀏覽 Java 目錄
551557
java.uninstall=移除此 Java
552558
java.uninstall.confirm=你確定要移除此 Java 嗎?此操作無法復原!
@@ -679,8 +685,8 @@ modpack.files.resourcepacks=資源包 (紋理包)
679685
modpack.files.saves=遊戲存檔
680686
modpack.files.scripts=MineTweaker 設定
681687
modpack.files.servers_dat=多人遊戲伺服器清單
682-
modpack.install=安裝 %s 模組包
683-
modpack.installing=正在安裝模組包
688+
modpack.installing=安裝模組包
689+
modpack.installing.given=安裝 %s 模組包
684690
modpack.introduction=支援 Curse、Modrinth、MultiMC、MCBBS 模組包。
685691
modpack.invalid=無效的模組包升級檔案,可能是下載時出現問題。
686692
modpack.mismatched_type=模組包類型不符,目前遊戲是「%s」模組包,但是提供的模組包更新檔案是「%s」模組包。

0 commit comments

Comments
 (0)