From 89df85b9a83ef4d5819bbc7f7a1db33af4c79224 Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Wed, 13 Mar 2019 16:55:21 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-15332=20=E6=9C=89=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83=E7=94=A8=E6=AF=94=E8=BE=83?=
 =?UTF-8?q?=E6=97=A9,=E9=9C=80=E8=A6=81=E5=9C=A8=E8=BF=99=E8=BE=B9?=
 =?UTF-8?q?=E5=B0=B1=E8=AE=BE=E7=BD=AE=E5=A5=BDlocale,=E7=94=B1=E4=BA=8E?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0GeneralContext=E9=BB=98=E8=AE=A4=E6=98=AFChin?=
 =?UTF-8?q?a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/DesignerEnvManager.java         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
index 522718d2dc..66a516554f 100644
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@@ -177,6 +177,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     public static DesignerEnvManager getEnvManager(boolean needCheckEnv) {
         if (designerEnvManager == null) {
             designerEnvManager = new DesignerEnvManager();
+            //REPORT-15332有一个国际化调用比较早,需要在这边就设置好locale,由于后台GeneralContext默认是China
+            GeneralContext.setLocale(designerEnvManager.getLanguage());
             try {
                 XMLTools.readFileXML(designerEnvManager, designerEnvManager.getDesignerEnvFile());
             } catch (Exception e) {