From 6f9175a2104461fc483604a8fce6fc717c03869a Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 9 Apr 2020 17:29:26 +0800
Subject: [PATCH] REPORT-29539 && REPORT-29457

---
 .../src/main/java/com/fr/design/EnvChangeEntrance.java        | 4 ++++
 .../src/main/java/com/fr/design/i18n/DesignI18nImpl.java      | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
index 81e62239b4..f16cdd5047 100644
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@@ -404,6 +404,10 @@ public class EnvChangeEntrance {
      * 处理异常
      */
     public void dealEvnExceptionWhenStartDesigner() {
+        ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
+        if (eventPipe != null) {
+            eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
+        }
         final EnvListPane envListPane = new EnvListPane();
         envListPane.populateEnvManager(currentEnvName);
         BasicDialog envListDialog = envListPane.showWindow(SwingUtilities.getWindowAncestor(DesignerContext.getDesignerFrame()));
diff --git a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java
index 176d6ec3c1..6e4fa7d3b0 100644
--- a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java
+++ b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java
@@ -1,5 +1,6 @@
 package com.fr.design.i18n;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.general.GeneralContext;
 import com.fr.general.log.MessageFormatter;
 import com.fr.locale.DesignI18nProvider;
@@ -29,7 +30,7 @@ public class DesignI18nImpl implements DesignI18nProvider {
 
     @Override
     public String i18nText(String key) {
-        return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, key);
+        return localeManager.getLocalBundle(DesignerEnvManager.getEnvManager().getLanguage()).getText(localeManager, key);
     }
 
     @Override