From af323c9e029681893de78606062d58fb6c479ac2 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 26 Jul 2017 10:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=8A=A0=E8=BD=BD=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/start/BaseDesigner.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java
index eb44ec0e3..f79baf460 100644
--- a/designer_base/src/com/fr/start/BaseDesigner.java
+++ b/designer_base/src/com/fr/start/BaseDesigner.java
@@ -17,15 +17,13 @@ import com.fr.design.fun.impl.GlobalListenerProviderManager;
 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.plugin.manage.PluginManager;
 import com.fr.stable.*;
@@ -68,6 +66,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         //下面这两句的位置不能随便调换，因为会影响语言切换的问题
         initLanguage();
 
+        // 在 initLanguage 之后加载设计器国际化文件，确保是正确的语言环境
+        Inter.loadLocaleFile(GeneralContext.getLocale(), DesignModule.LOCALE_FILE_PATH);
+
         SplashWindow splashWindow = new SplashWindow(createSplashPane());
         if (args != null) {
             for (String arg : args) {