Merge pull request #982 in BA/design from ~PLOUGH/design:release to release

* commit '62066d4e953d9a125e584007a1ff81ddab9b4adb':
  REPORT-3184 设计器安装后默认工作目录的名字

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

@@ -2001,4 +2001,5 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build Tree according marked filed's length
 FR-Product_Demo=Demo
 FR-Designer_Tree_Data_Field=Tree Data Field
-FR-Designer_Data_Filter=Data Filter
+FR-Designer_Data_Filter=Data Filter
+Default=Default

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

@@ -2002,4 +2002,5 @@ FR-Designer_Tree_Data_Field=Tree Data Field
 FR-Designer_Parent_Marked_Field=Parent Tag Field
 FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the parent tag field of the selected data set
 FR-Product_Demo=Demo
-FR-Designer_Data_Filter=Data Filter
+FR-Designer_Data_Filter=Data Filter
+Default=Default

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

@@ -2002,3 +2002,4 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u89AA\u30DE\u30FC\u30AF\u30D5
 FR-Product_Demo=\u88FD\u54C1\u30C7\u30E2
 FR-Designer_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF
 FR-Designer_Can_not_use_FormatBursh=\u9023\u7D9A\u3057\u306A\u3044\u8907\u6570\u9818\u57DF\u3067\u306F\u66F8\u5F0F\u30B3\u30D4\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+Default=\u65E2\u5B9A

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

@@ -2001,4 +2001,5 @@ FR-Designer_Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
 FR-Designer_Parent_Marked_Field=\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC
 FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
 FR-Product_Demo=\uC81C\uD488\uC2DC\uC5F0
-FR-Designer_Data_Filter=\uB370\uC774\uD130\uC120\uBCC4
+FR-Designer_Data_Filter=\uB370\uC774\uD130\uC120\uBCC4
+Default=\uAE30\uBCF8

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

@@ -2002,3 +2002,4 @@ FR-Designer_Parent_Marked_Field=\u7236\u6807\u8BB0\u5B57\u6BB5
 FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u7236\u6807\u8BB0\u5B57\u6BB5\u6784\u5EFA\u6811
 FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A
 FR-Designer_Data_Filter=\u6570\u636E\u7B5B\u9009
+Default=\u9ED8\u8BA4

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

@@ -2002,4 +2002,5 @@ FR-Designer_Tree_Data_Field=\u6A39\u72C0\u8CC7\u6599\u6B04\u4F4D
 FR-Designer_Parent_Marked_Field=\u7236\u6A19\u8A18\u6B04\u4F4D
 FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u7236\u6A19\u8A18\u6B04\u4F4D\u69CB\u5EFA\u6A39
 FR-Product_Demo=\u529F\u80FD\u5C55\u793A
-FR-Designer_Data_Filter=\u8CC7\u6599\u7BE9\u9078
+FR-Designer_Data_Filter=\u8CC7\u6599\u7BE9\u9078
+Default=\u9810\u8A2D

designer_base/src/com/fr/start/BaseDesigner.java

@@ -61,12 +61,12 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         }
         BuildContext.setBuildFilePath(buildPropertiesPath());
 
-        //下面这两句的位置不能随便调换，因为会影响语言切换的问题
-        initLanguage();
-
         // 先加载设计器的国际化文件
         Inter.loadLocaleFile(GeneralContext.getLocale(), DesignModule.LOCALE_FILE_PATH);
 
+        //下面这两句的位置不能随便调换，因为会影响语言切换的问题
+        initLanguage();
+
         SplashWindow splashWindow = new SplashWindow(createSplashPane());
         if (args != null) {
             for (String arg : args) {