From f243ef88c77bab4bd8e586f4a3fc8d55d3d376f2 Mon Sep 17 00:00:00 2001 From: Hades Date: Mon, 12 Aug 2019 13:36:05 +0800 Subject: [PATCH] update --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fdb4cb4f5..fa705c2a8 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -187,7 +187,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { if (designerEnvManager == null) { designerEnvManager = new DesignerEnvManager(); //REPORT-15332有一个国际化调用比较早,需要在这边就设置好locale,由于后台GeneralContext默认是China - GeneralContext.setLocale(designerEnvManager.getLanguage()); + GeneralContext.setLocale(DesignerEnvManager.designerEnvManager.checkLocale(designerEnvManager.getLanguage())); try { XMLTools.readFileXML(designerEnvManager, designerEnvManager.getDesignerEnvFile()); } catch (Exception e) { @@ -1373,7 +1373,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { * @return */ private Locale checkLocale(Locale locale) { - return SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US; + return Locale.US;//SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US; } private void readReportLengthUnit(XMLableReader reader) {