REPORT-92757 【国际化】FR海外版本去除中文

designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java

@@ -4,7 +4,7 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.IOUtils;
-import com.fr.general.locale.image.LocaleImageFactory;
+import com.fr.general.locale.image.I18nImage;
 
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -35,9 +35,9 @@ public class RemindPane extends JPanel {
     private Icon unCheckIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/uncheck.png");
     private Icon closeIcon = IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/remind_close.png");
     private static final String REMIND_IMAGE_URL = "/com/fr/design/mainframe/alphafine/images/open/open.png";
-    private Icon labelIcon = new ImageIcon(LocaleImageFactory.createLocaleMark(REMIND_IMAGE_URL).getValue());
+    private Icon labelIcon = new ImageIcon(I18nImage.getImage(REMIND_IMAGE_URL));
     private static final String OPEN_IMAGE_URL = "/com/fr/design/mainframe/alphafine/images/open/open.png";
-    private final Icon openIcon = new ImageIcon(LocaleImageFactory.createLocaleMark(OPEN_IMAGE_URL).getValue());
+    private final Icon openIcon = new ImageIcon(I18nImage.getImage(OPEN_IMAGE_URL));
 
     private static final int WIDTH = 600;
     private static final int HEIGHT = 400;

designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java

@@ -11,7 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.theme.dialog.TemplateThemeProfileDialog;
 import com.fr.general.IOUtils;
-import com.fr.general.locale.image.LocaleImageFactory;
+import com.fr.general.locale.image.I18nImage;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
@@ -210,7 +210,7 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
 
     private static class ThumbnailPane extends JPanel {
         private static final String LOADING_IMAGE_URL = "/com/fr/design/images/mainframe/loading/loading.gif";
-        private static final Image LOADING_IMAGE = LocaleImageFactory.createLocaleMark(LOADING_IMAGE_URL).getValue();
+        private static final Image LOADING_IMAGE = I18nImage.getImage(LOADING_IMAGE_URL);
         private Image thumbnail = null;
 
         @Override

designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_en_US.css

@@ -45,7 +45,7 @@
   background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
 }
 .designer-login-guide {
-  background: url(../../../img/guide/login_guide_en_US.png) no-repeat center center;
+  background: url(../../../img/guide/login_guide_en.png) no-repeat center center;
   background-size: cover;
 }
 .designer-guide-login-button {

designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_ja_JP.css

@@ -45,7 +45,7 @@
   background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
 }
 .designer-login-guide {
-  background: url(../../../img/guide/login_guide_en_US.png) no-repeat center center;
+  background: url(../../../img/guide/login_guide_en.png) no-repeat center center;
   background-size: cover;
 }
 .designer-guide-login-button {

designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_ko_KR.css

@@ -45,7 +45,7 @@
   background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
 }
 .designer-login-guide {
-  background: url(../../../img/guide/login_guide_en_US.png) no-repeat center center;
+  background: url(../../../img/guide/login_guide_en.png) no-repeat center center;
   background-size: cover;
 }
 .designer-guide-login-button {

designer-base/src/main/resources/com/fr/design/login/lib/locale/guide/guide_zh_CN.css

@@ -45,7 +45,7 @@
   background: url(../../../img/icon_close9x9_hover.png) no-repeat center center;
 }
 .designer-login-guide {
-  background: url(../../../img/guide/login_guide_zh_CN.png) no-repeat center center;
+  background: url(../../../img/guide/login_guide_zh.png) no-repeat center center;
   background-size: cover;
 }
 .designer-guide-login-button {

designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java

@@ -14,8 +14,7 @@ import com.fr.design.style.background.image.ImageFileChooser;
 import com.fr.design.style.background.image.ImagePreviewPane;
 import com.fr.design.utils.ImageUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.locale.image.LocaleImageFactory;
+import com.fr.general.locale.image.I18nImage;
-import com.fr.general.locale.image.LocaleImageMark;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StringUtils;
@@ -63,9 +62,8 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
 
     private static final String EMPTY_DATA_IMAGE_PATH = "/com/fr/design/images/emptydata/emptydata.png";
 
-    static {
+    static {;
-        LocaleImageMark localeImageMark = LocaleImageFactory.createLocaleMark(EMPTY_DATA_IMAGE_PATH);
+        DEFAULT_EMPTY_DATA_IMAGE = I18nImage.getImage(EMPTY_DATA_IMAGE_PATH);
-        DEFAULT_EMPTY_DATA_IMAGE = localeImageMark.getValue();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java

@@ -12,7 +12,7 @@ import com.fr.general.CloudCenter;
 import com.fr.general.IOUtils;
 import com.fr.general.SiteBlockedException;
 import com.fr.general.http.HttpClient;
-import com.fr.general.locale.image.LocaleImageFactory;
+import com.fr.general.locale.image.I18nImage;
 import com.fr.plugin.chart.DownloadSourcesEvent;
 import com.fr.stable.CommonUtils;
 import com.fr.stable.StableUtils;
@@ -31,7 +31,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
@@ -190,8 +189,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
     private void initDialog() {
 
         // 创建标签,并在标签上放置一张图片
-        BufferedImage image = LocaleImageFactory.createLocaleMark(BACKGROUND_IMAGE_URL).getValue();
+        ImageIcon imageIcon = new ImageIcon(I18nImage.getImage(BACKGROUND_IMAGE_URL));
-        ImageIcon imageIcon = new ImageIcon(image);
         UILabel label = new UILabel(imageIcon);
         label.setBounds(0, 0, LOAD_WIDTH, LOAD_HEIGHT);
 

designer-form/src/main/java/com/fr/design/designer/creator/XAutoChartCreator.java

@@ -12,8 +12,7 @@ import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.form.ui.ChartAutoEditor;
-import com.fr.general.locale.image.LocaleImageFactory;
+import com.fr.general.locale.image.I18nImage;
-import com.fr.general.locale.image.LocaleImageMark;
 import com.fr.stable.Constants;
 import com.fr.stable.bridge.StableFactory;
 
@@ -107,8 +106,7 @@ public class XAutoChartCreator extends XChartEditor {
 
     @Override
     public void paintForeground(Graphics2D g) {
-        LocaleImageMark localeImageMark = LocaleImageFactory.createLocaleMark(AUTO_CHART_IMAGE_PATH);
+        BufferedImage bufferedImage = I18nImage.getImage(AUTO_CHART_IMAGE_PATH);
-        BufferedImage bufferedImage = localeImageMark.getValue();;
         GraphHelper.paintImage(
                 g, this.getWidth(), this.getHeight(), bufferedImage,
                 Constants.IMAGE_ADJUST,

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

@@ -7,7 +7,7 @@ import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
 import com.fr.general.GeneralContext;
-import com.fr.general.locale.image.LocaleImageFactory;
+import com.fr.general.locale.image.I18nImage;
 import com.fr.module.ModuleEvent;
 import com.fr.stable.StringUtils;
 
@@ -177,6 +177,6 @@ public class SplashContext {
     }
 
     private static String getSplashPath() {
-        return LocaleImageFactory.createLocaleMark(SPLASH_IMAGE_PATH).getImagePath();
+        return I18nImage.getImagePath(SPLASH_IMAGE_PATH);
     }
 }

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

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

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

@@ -3,7 +3,7 @@ package com.fr.start.common;
 import com.bulenkov.iconloader.IconLoader;
 import com.fr.base.BaseUtils;
 import com.fr.general.IOUtils;
-import com.fr.general.locale.image.LocaleImageFactory;
+import com.fr.general.locale.image.I18nImage;
 
 import javax.swing.Icon;
 import java.awt.Dimension;
@@ -43,8 +43,8 @@ public class SplashPane4WinAndJDK11 extends SplashPane{
     }
 
     private String getSplashPath4WinAndJdk11() {
-        String path = LocaleImageFactory.createLocaleMark(SPLASH_PATH).getImagePath();
+        String path = I18nImage.getImagePath(SPLASH_PATH);
-        String pathOfDouble = LocaleImageFactory.createLocaleMark(DOUBLE_SPLASH_PATH).getImagePath();
+        String pathOfDouble = I18nImage.getImagePath(DOUBLE_SPLASH_PATH);
         // 为图片加上"@2x"
         // 某些定制jar里面没有两倍图，判断一下，如果文件不存在，就返回一倍图的path
         if (IOUtils.readResource(pathOfDouble) != null) {