Browse Source

Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0

feature/big-screen
白岳 5 years ago
parent
commit
57f1c99dd6
  1. 4
      designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
  2. 3
      designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java

4
designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@ -404,6 +404,10 @@ public class EnvChangeEntrance {
* 处理异常 * 处理异常
*/ */
public void dealEvnExceptionWhenStartDesigner() { public void dealEvnExceptionWhenStartDesigner() {
ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
if (eventPipe != null) {
eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
}
final EnvListPane envListPane = new EnvListPane(); final EnvListPane envListPane = new EnvListPane();
envListPane.populateEnvManager(currentEnvName); envListPane.populateEnvManager(currentEnvName);
BasicDialog envListDialog = envListPane.showWindow(SwingUtilities.getWindowAncestor(DesignerContext.getDesignerFrame())); BasicDialog envListDialog = envListPane.showWindow(SwingUtilities.getWindowAncestor(DesignerContext.getDesignerFrame()));

3
designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java

@ -1,5 +1,6 @@
package com.fr.design.i18n; package com.fr.design.i18n;
import com.fr.design.DesignerEnvManager;
import com.fr.general.GeneralContext; import com.fr.general.GeneralContext;
import com.fr.general.log.MessageFormatter; import com.fr.general.log.MessageFormatter;
import com.fr.locale.DesignI18nProvider; import com.fr.locale.DesignI18nProvider;
@ -29,7 +30,7 @@ public class DesignI18nImpl implements DesignI18nProvider {
@Override @Override
public String i18nText(String key) { public String i18nText(String key) {
return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, key); return localeManager.getLocalBundle(DesignerEnvManager.getEnvManager().getLanguage()).getText(localeManager, key);
} }
@Override @Override

Loading…
Cancel
Save