Language Overhaul

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -244,9 +244,9 @@ public void onStop(boolean success, TaskExecutor executor) {
                                 } else if (ex instanceof PermissionException) {
                                     message = i18n("launch.failed.executable_permission");
                                 } else if (ex instanceof ProcessCreationException) {
-                                    message = i18n("launch.failed.creating_process") + ex.getLocalizedMessage();
+                                    message = i18n("launch.failed.creating_process") + "\n" + ex.getLocalizedMessage();
                                 } else if (ex instanceof NotDecompressingNativesException) {
-                                    message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
+                                    message = i18n("launch.failed.decompressing_natives") + "\n" + ex.getLocalizedMessage();
                                 } else if (ex instanceof LibraryDownloadException) {
                                     message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n";
                                     if (ex.getCause() instanceof ResponseCodeException) {
@@ -881,8 +881,8 @@ public void onExit(int exitCode, ExitType exitType) {
 
     }
 
-    private static final String ORACLEJDK_DOWNLOAD_LINK = "https://www.java.com/download";
-    private static final String OPENJDK_DOWNLOAD_LINK = "https://docs.microsoft.com/java/openjdk/download";
+    private static final String ORACLEJDK_DOWNLOAD_LINK = "https://www.java.com/download/";
+    private static final String OPENJDK_DOWNLOAD_LINK = "https://learn.microsoft.com/java/openjdk/download";
 
     public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java

@@ -44,6 +44,7 @@
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
 import java.net.URI;
+import java.util.Locale;
 
 import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -95,7 +96,7 @@ public AccountListPageSkin(AccountListPage skinnable) {
                 VBox boxMethods = new VBox();
                 {
                     boxMethods.getStyleClass().add("advanced-list-box-content");
-                    boxMethods.getChildren().add(new ClassTitle(i18n("account.create")));
+                    boxMethods.getChildren().add(new ClassTitle(i18n("account.create").toUpperCase(Locale.ROOT)));
                     FXUtils.setLimitWidth(boxMethods, 200);
 
                     AdvancedListItem offlineItem = new AdvancedListItem();

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

@@ -55,6 +55,7 @@
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Locale;
 import java.util.concurrent.CancellationException;
 import java.util.function.Supplier;
 
@@ -101,7 +102,7 @@ public DownloadPage() {
 
         {
             AdvancedListBox sideBar = new AdvancedListBox()
-                    .startCategory(i18n("download.game"))
+                    .startCategory(i18n("download.game").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(item -> {
                         item.setTitle(i18n("game"));
                         item.setLeftGraphic(wrap(SVG.GAMEPAD));
@@ -114,7 +115,7 @@ public DownloadPage() {
                         settingsItem.activeProperty().bind(tab.getSelectionModel().selectedItemProperty().isEqualTo(modpackTab));
                         settingsItem.setOnAction(e -> tab.select(modpackTab));
                     })
-                    .startCategory(i18n("download.content"))
+                    .startCategory(i18n("download.content").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(item -> {
                         item.setTitle(i18n("mods"));
                         item.setLeftGraphic(wrap(SVG.PUZZLE));

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/DownloadSettingsPage.java

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui.main;
 
 import com.jfoenix.controls.*;
-import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
@@ -100,7 +99,7 @@ public DownloadSettingsPage() {
                 downloadSource.getChildren().setAll(chooseWrapper, versionListSourcePane, downloadSourcePane);
             }
 
-            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.version_list_source")), downloadSource);
+            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.download_source")), downloadSource);
         }
 
         {
@@ -158,7 +157,7 @@ public DownloadSettingsPage() {
                 }
             }
 
-            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("download")), downloadThreads);
+            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.download.threads")), downloadThreads);
         }
 
         {
@@ -204,7 +203,6 @@ public DownloadSettingsPage() {
                         Label host = new Label(i18n("settings.launcher.proxy.host"));
                         GridPane.setRowIndex(host, 1);
                         GridPane.setColumnIndex(host, 0);
-                        GridPane.setHalignment(host, HPos.RIGHT);
                         gridPane.getChildren().add(host);
                     }
 
@@ -220,7 +218,6 @@ public DownloadSettingsPage() {
                         Label port = new Label(i18n("settings.launcher.proxy.port"));
                         GridPane.setRowIndex(port, 2);
                         GridPane.setColumnIndex(port, 0);
-                        GridPane.setHalignment(port, HPos.RIGHT);
                         gridPane.getChildren().add(port);
                     }
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/LauncherSettingsPage.java

@@ -33,6 +33,8 @@
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.versions.VersionSettingsPage;
 
+import java.util.Locale;
+
 import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -70,6 +72,7 @@ public LauncherSettingsPage() {
 
         {
             AdvancedListBox sideBar = new AdvancedListBox()
+                    .startCategory(i18n("game").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(settingsItem -> {
                         settingsItem.setTitle(i18n("settings.type.global.manage"));
                         settingsItem.setLeftGraphic(wrap(SVG.GAMEPAD));
@@ -83,7 +86,7 @@ public LauncherSettingsPage() {
                         javaItem.activeProperty().bind(tab.getSelectionModel().selectedItemProperty().isEqualTo(javaManagementTab));
                         javaItem.setOnAction(e -> tab.select(javaManagementTab));
                     })
-                    .startCategory(i18n("launcher"))
+                    .startCategory(i18n("launcher").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(settingsItem -> {
                         settingsItem.setTitle(i18n("settings.launcher.general"));
                         settingsItem.setLeftGraphic(wrap(SVG.APPLICATION_OUTLINE));
@@ -102,7 +105,7 @@ public LauncherSettingsPage() {
                         downloadItem.activeProperty().bind(tab.getSelectionModel().selectedItemProperty().isEqualTo(downloadTab));
                         downloadItem.setOnAction(e -> tab.select(downloadTab));
                     })
-                    .startCategory(i18n("help"))
+                    .startCategory(i18n("help").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(helpItem -> {
                         helpItem.setTitle(i18n("help"));
                         helpItem.setLeftGraphic(wrap(SVG.HELP_CIRCLE_OUTLINE));

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java

@@ -104,9 +104,9 @@ public final class MainPage extends StackPane implements DecoratorPage {
         if (Metadata.isNightly() || (Metadata.isDev() && !Objects.equals(Metadata.VERSION, config().getShownTips().get(ANNOUNCEMENT)))) {
             announcementPane = new VBox(16);
             if (Metadata.isNightly()) {
-                announcementPane.getChildren().add(new AnnouncementCard(i18n("update.channel.nightly.title"), i18n("update.channel.nightly.hint")));
+                announcementPane.getChildren().add(new AnnouncementCard(i18n("update.channel.snapshot.title"), i18n("update.channel.snapshot.hint")));
             } else if (Metadata.isDev()) {
-                announcementPane.getChildren().add(new AnnouncementCard(i18n("update.channel.dev.title"), i18n("update.channel.dev.hint")));
+                announcementPane.getChildren().add(new AnnouncementCard(i18n("update.channel.beta.title"), i18n("update.channel.beta.hint")));
             }
             getChildren().add(announcementPane);
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java

@@ -133,7 +133,7 @@ public SettingsView() {
                         content.setSpacing(8);
 
                         chkUpdateStable = new JFXRadioButton(i18n("update.channel.stable"));
-                        chkUpdateDev = new JFXRadioButton(i18n("update.channel.dev"));
+                        chkUpdateDev = new JFXRadioButton(i18n("update.channel.beta"));
 
                         TextFlow noteWrapper = new TextFlow(new Text(i18n("update.note")));
                         VBox.setMargin(noteWrapper, new Insets(10, 0, 0, 0));

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java

@@ -388,15 +388,15 @@ private static final class ModItem extends StackPane {
 
                     switch (dataItem.getVersionType()) {
                         case Alpha:
-                            content.getTags().add(i18n("version.game.snapshot"));
+                            content.getTags().add(i18n("mods.channel.alpha"));
                             graphicPane.getChildren().setAll(SVG.ALPHA_CIRCLE_OUTLINE.createIcon(Theme.blackFill(), 24, 24));
                             break;
                         case Beta:
-                            content.getTags().add(i18n("version.game.snapshot"));
+                            content.getTags().add(i18n("mods.channel.beta"));
                             graphicPane.getChildren().setAll(SVG.BETA_CIRCLE_OUTLINE.createIcon(Theme.blackFill(), 24, 24));
                             break;
                         case Release:
-                            content.getTags().add(i18n("version.game.release"));
+                            content.getTags().add(i18n("mods.channel.release"));
                             graphicPane.getChildren().setAll(SVG.RELEASE_CIRCLE_OUTLINE.createIcon(Theme.blackFill(), 24, 24));
                             break;
                     }