From ab36e7b5bb9a054f5cae40c377dfca513c061470 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Thu, 18 May 2017 15:20:46 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-2675=20=E9=83=A8=E5=88=86=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96key=E6=89=BE=E4=B8=8D=E5=88=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/module/DesignModule.java | 3 ++-
 designer_base/src/com/fr/start/BaseDesigner.java         | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/module/DesignModule.java b/designer_base/src/com/fr/design/module/DesignModule.java
index 14ed20aea8..f04aa54741 100644
--- a/designer_base/src/com/fr/design/module/DesignModule.java
+++ b/designer_base/src/com/fr/design/module/DesignModule.java
@@ -33,6 +33,7 @@ import java.util.Set;
  * 所有设计器模块的父类
  */
 public abstract class DesignModule extends TopModule {
+	public static final String LOCALE_FILE_PATH = "com/fr/design/locale/designer";
 	public void start() {
 		super.start();
 		App<?>[] apps = apps4TemplateOpener();
@@ -62,7 +63,7 @@ public abstract class DesignModule extends TopModule {
 	 * @return 国际化文件路径
 	 */
 	public String[] getLocaleFile() {
-		return new String[]{"com/fr/design/locale/designer"};
+		return new String[]{LOCALE_FILE_PATH};
 	}
 
 	public Class<?>[] actionsForInsertCellElement() {
diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java
index 0e036c5340..f70d7b5510 100644
--- a/designer_base/src/com/fr/start/BaseDesigner.java
+++ b/designer_base/src/com/fr/start/BaseDesigner.java
@@ -16,15 +16,13 @@ import com.fr.design.fun.GlobalListenerProvider;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
+import com.fr.design.module.DesignModule;
 import com.fr.design.utils.DesignUtils;
 import com.fr.env.SignIn;
 import com.fr.file.FILE;
 import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
-import com.fr.general.Inter;
-import com.fr.general.ModuleContext;
+import com.fr.general.*;
 import com.fr.plugin.PluginCollector;
 import com.fr.stable.*;
 
@@ -66,6 +64,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         //下面这两句的位置不能随便调换，因为会影响语言切换的问题
         initLanguage();
 
+        // 先加载设计器的国际化文件
+        Inter.loadLocaleFile(GeneralContext.getLocale(), DesignModule.LOCALE_FILE_PATH);
+
         SplashWindow splashWindow = new SplashWindow(createSplashPane());
         if (args != null) {
             for (String arg : args) {