Browse Source

Merge pull request #11 in DESIGN/design from ~NEIL/design_n:feature/10.0 to feature/10.0

* commit '6ac14265040044612ad460835ce1eaf331cc893d':
  REPORT-7517 国际化移动到i18n
master
superman 7 years ago
parent
commit
26c0cbbfa1
  1. 2
      designer/src/com/fr/start/Designer.java
  2. 2385
      designer_base/src/com/fr/design/locale/designer.properties
  3. 2384
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  4. 2385
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  5. 2385
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  6. 2385
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  7. 2384
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  8. 2
      designer_base/src/com/fr/design/module/DesignModule.java
  9. 18
      designer_base/src/com/fr/start/StartServer.java

2
designer/src/com/fr/start/Designer.java

@ -87,6 +87,8 @@ public class Designer extends BaseDesigner {
//传递启动参数
designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args));
designerRoot.start();
// 预启动一下
StartServer.start();
}
public Designer(String[] args) {

2385
designer_base/src/com/fr/design/locale/designer.properties

File diff suppressed because it is too large Load Diff

2384
designer_base/src/com/fr/design/locale/designer_en_US.properties

File diff suppressed because it is too large Load Diff

2385
designer_base/src/com/fr/design/locale/designer_ja_JP.properties

File diff suppressed because it is too large Load Diff

2385
designer_base/src/com/fr/design/locale/designer_ko_KR.properties

File diff suppressed because it is too large Load Diff

2385
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

File diff suppressed because it is too large Load Diff

2384
designer_base/src/com/fr/design/locale/designer_zh_TW.properties

File diff suppressed because it is too large Load Diff

2
designer_base/src/com/fr/design/module/DesignModule.java

@ -36,7 +36,7 @@ import java.util.Set;
* 所有设计器模块的父类
*/
public abstract class DesignModule extends TopModule {
public static final String LOCALE_FILE_PATH = "com/fr/design/locale/designer";
public static final String LOCALE_FILE_PATH = "com/fr/design/i18n/main";
public void start() {
super.start();

18
designer_base/src/com/fr/start/StartServer.java

@ -103,12 +103,7 @@ public class StartServer {
}
}
/**
* 本地环境浏览url
*
* @param url 指定路径
*/
public static void browserURLWithLocalEnv(String url) {
public static void start() {
try {
if (tomcatHost != null) {
if (NEED_LOAD_ENV) {
@ -131,10 +126,19 @@ public class StartServer {
FRContext.getLogger().errorWithServerLevel(e.getMessage());
} finally {
NEED_LOAD_ENV = false;
browser(url);
}
}
/**
* 本地环境浏览url
*
* @param url 指定路径
*/
public static void browserURLWithLocalEnv(String url) {
start();
browser(url);
}
public static TomcatHost getInstance() {
// august: 正确的逻辑能保证jettyHost不为null,不然就有bug,不允许这儿加是否等于null判断
return tomcatHost;

Loading…
Cancel
Save