Browse Source

Merge pull request #797 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0

* commit '89df85b9a83ef4d5819bbc7f7a1db33af4c79224':
  REPORT-15332 有一个国际化调用比较早,需要在这边就设置好locale,由于后台GeneralContext默认是China
bugfix/10.0
zack 6 years ago
parent
commit
f8324dfd25
  1. 2
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

2
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) { public static DesignerEnvManager getEnvManager(boolean needCheckEnv) {
if (designerEnvManager == null) { if (designerEnvManager == null) {
designerEnvManager = new DesignerEnvManager(); designerEnvManager = new DesignerEnvManager();
//REPORT-15332有一个国际化调用比较早,需要在这边就设置好locale,由于后台GeneralContext默认是China
GeneralContext.setLocale(designerEnvManager.getLanguage());
try { try {
XMLTools.readFileXML(designerEnvManager, designerEnvManager.getDesignerEnvFile()); XMLTools.readFileXML(designerEnvManager, designerEnvManager.getDesignerEnvFile());
} catch (Exception e) { } catch (Exception e) {

Loading…
Cancel
Save