From 0342678cc8b2ed9d1e1862e88f597311a0bd09fb Mon Sep 17 00:00:00 2001
From: Yuanuox <yuanuox@outlook.com>
Date: Mon, 28 Nov 2022 21:41:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api                                                        | 2 +-
 app/src/main/java/org/appxi/smartlib/app/App.java          | 2 --
 app/src/main/java/org/appxi/smartlib/app/AppLauncher.java  | 2 ++
 app/src/main/java/org/appxi/smartlib/app/AppPreloader.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api b/api
index 1e83555..2aa29dc 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit 1e835550173c7ba275956a2ac94b034852068654
+Subproject commit 2aa29dc4d85afaeb320998e042acb6777c9a7d6b
diff --git a/app/src/main/java/org/appxi/smartlib/app/App.java b/app/src/main/java/org/appxi/smartlib/app/App.java
index 44de0a8..d75c182 100644
--- a/app/src/main/java/org/appxi/smartlib/app/App.java
+++ b/app/src/main/java/org/appxi/smartlib/app/App.java
@@ -26,7 +26,6 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
 
 public class App extends WorkbenchApp {
@@ -47,7 +46,6 @@ public static App app() {
     public void init() throws Exception {
         super.init();
         //
-        Locale.setDefault(Locale.SIMPLIFIED_CHINESE);
         new Thread(() -> {
             WebPane.preloadLibrary();
             BeansContext.setupInitialize(
diff --git a/app/src/main/java/org/appxi/smartlib/app/AppLauncher.java b/app/src/main/java/org/appxi/smartlib/app/AppLauncher.java
index 0e45d6b..d1b6f3e 100644
--- a/app/src/main/java/org/appxi/smartlib/app/AppLauncher.java
+++ b/app/src/main/java/org/appxi/smartlib/app/AppLauncher.java
@@ -10,9 +10,11 @@
 import java.nio.file.Path;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 public class AppLauncher {
     protected static void beforeLaunch(String dataDirName) {
+        Locale.setDefault(Locale.SIMPLIFIED_CHINESE);
         // 0, set data home
         UserPrefs.localDataDirectory((null != dataDirName ? dataDirName : ".".concat(App.ID)).concat(".d"), null);
         // 由于在配置文件中不能使用动态变量作为路径，故在此设置日志文件路径
diff --git a/app/src/main/java/org/appxi/smartlib/app/AppPreloader.java b/app/src/main/java/org/appxi/smartlib/app/AppPreloader.java
index b039982..88f8765 100644
--- a/app/src/main/java/org/appxi/smartlib/app/AppPreloader.java
+++ b/app/src/main/java/org/appxi/smartlib/app/AppPreloader.java
@@ -57,7 +57,7 @@ public void start(Stage primaryStage) throws Exception {
         //
         setupChooser(primaryStage);
         //
-        FontFaceHelper.fixing();
+        FontFaceHelper.fixFontFamilies();
         //
         if (OSVersions.isLinux || OSVersions.isMac) {
             new javafx.scene.control.TextField("");