Merge pull request #13611 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'c757036cc9e6f3bf25d3e79f456f9369d059d9be':
  REPORT-114494 fix:【FR国际化】启动页logo新版本显示中文

designer-realize/src/main/java/com/fr/start/SplashContext.java

@@ -1,6 +1,7 @@
 package com.fr.start;
 
 import com.fr.concurrent.NamedThreadFactory;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.constants.DesignerLaunchStatus;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.bbs.BBSConstants;
@@ -186,6 +187,6 @@ public class SplashContext {
     }
 
     private static String getSplashPath() {
-        return I18nImage.getImagePath(SPLASH_IMAGE_PATH);
+        return I18nImage.getImagePath(SPLASH_IMAGE_PATH, DesignerEnvManager.getEnvManager().getLanguage());
     }
 }

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.design.DesignerEnvManager;
 import com.fr.general.locale.image.I18nImage;
 import com.fr.stable.GraphDrawHelper;
 import com.fr.stable.GraphicsConfig;
@@ -59,7 +60,7 @@ public class SplashPane extends JPanel {
     }
 
     private static String getSplashPath() {
-        return I18nImage.getImagePath(SPLASH_PATH);
+        return I18nImage.getImagePath(SPLASH_PATH, DesignerEnvManager.getEnvManager().getLanguage());
     }
 
     private NotNullLazyValue<Font> fontValue = new NotNullLazyValue<Font>() {

designer-realize/src/main/java/com/fr/start/common/SplashPane4WinAndJDK11.java

@@ -2,6 +2,7 @@ package com.fr.start.common;
 
 import com.bulenkov.iconloader.IconLoader;
 import com.fr.base.BaseUtils;
+import com.fr.design.DesignerEnvManager;
 import com.fr.general.IOUtils;
 import com.fr.general.locale.image.I18nImage;
 
@@ -11,6 +12,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
+import java.util.Locale;
 
 /**
  * @author Yvan
@@ -43,8 +45,9 @@ public class SplashPane4WinAndJDK11 extends SplashPane{
     }
 
     private String getSplashPath4WinAndJdk11() {
-        String path = I18nImage.getImagePath(SPLASH_PATH);
+        Locale locale = DesignerEnvManager.getEnvManager().getLanguage();
-        String pathOfDouble = I18nImage.getImagePath(DOUBLE_SPLASH_PATH);
+        String path = I18nImage.getImagePath(SPLASH_PATH, locale);
+        String pathOfDouble = I18nImage.getImagePath(DOUBLE_SPLASH_PATH, locale);
         // 为图片加上"@2x"
         // 某些定制jar里面没有两倍图，判断一下，如果文件不存在，就返回一倍图的path
         if (IOUtils.readResource(pathOfDouble) != null) {