From 08ac3f909bb07b5ba151d2029f9629ff589507b7 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Tue, 20 Aug 2024 09:33:32 +0800
Subject: [PATCH] =?UTF-8?q?INO-21074=20=E5=90=AF=E5=8A=A8=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/start/SplashContext.java            | 5 +++--
 .../src/main/java/com/fr/start/common/SplashPane.java        | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/start/SplashContext.java b/designer-realize/src/main/java/com/fr/start/SplashContext.java
index 6d2895503b..51c414f2ad 100644
--- a/designer-realize/src/main/java/com/fr/start/SplashContext.java
+++ b/designer-realize/src/main/java/com/fr/start/SplashContext.java
@@ -1,5 +1,6 @@
 package com.fr.start;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.constants.DesignerLaunchStatus;
@@ -106,7 +107,7 @@ public class SplashContext {
             public void run() {
                 showThanks();
                 loadingIndex++;
-                updateModuleLog(moduleId.isEmpty() ? StringUtils.EMPTY : moduleId + loading[loadingIndex % 3]);
+                updateModuleLog(moduleId.isEmpty() ? StringUtils.EMPTY : BidiUtils.concatenateStrings(moduleId, loading[loadingIndex % 3]));
             }
         }, 0, 300, TimeUnit.MILLISECONDS);
 
@@ -116,7 +117,7 @@ public class SplashContext {
             public void on(Event event, String i18n) {
                 moduleId = i18n;
                 loadingIndex++;
-                updateModuleLog(moduleId.isEmpty() ? StringUtils.EMPTY : moduleId + loading[loadingIndex % 3]);
+                updateModuleLog(moduleId.isEmpty() ? StringUtils.EMPTY : BidiUtils.concatenateStrings(moduleId, loading[loadingIndex % 3]));
             }
         };
         EventDispatcher.listen(ModuleEvent.MajorModuleStarting, listener);
diff --git a/designer-realize/src/main/java/com/fr/start/common/SplashPane.java b/designer-realize/src/main/java/com/fr/start/common/SplashPane.java
index 535ace2d24..a11a231916 100644
--- a/designer-realize/src/main/java/com/fr/start/common/SplashPane.java
+++ b/designer-realize/src/main/java/com/fr/start/common/SplashPane.java
@@ -3,6 +3,7 @@ package com.fr.start.common;
 import com.bulenkov.iconloader.IconLoader;
 import com.bulenkov.iconloader.util.JBUI;
 import com.fr.base.GraphHelper;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.general.locale.image.I18nImage;
 import com.fr.stable.GraphDrawHelper;
@@ -46,6 +47,7 @@ public class SplashPane extends JPanel {
 
     private static final String ARIAL_FONT_NAME = "Arial";
     private static final String YAHEI_FONT_NAME = "Microsoft YaHei";
+    private static final String ARABIC_FONT_NAME = "Calibri";
 
     private String thanksLog = StringUtils.EMPTY;
     private String moduleText = StringUtils.EMPTY;
@@ -74,6 +76,9 @@ public class SplashPane extends JPanel {
             if (font == null || isDialogFont(font)) {
                 font = createFont(ARIAL_FONT_NAME);
             }
+            if (BidiUtils.rtl()) {
+                font = createFont(ARABIC_FONT_NAME);
+            }
             return font;
         }
     };