Browse Source

Merge pull request #846 in BA/design from ~PLOUGH/design:dev to dev

* commit '53f18866a267b3a97979306dc3dc73948089792d':
  无JIRA任务,国际化,把release、master中的key合并到dev中
  无JIRA任务,解决冲突
master
superman 8 years ago
parent
commit
a43cb7488a
  1. 7
      designer_base/src/com/fr/design/locale/designer.properties
  2. 8
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  3. 34
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  4. 40
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  5. 4
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  6. 16
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  7. 7
      designer_base/src/com/fr/design/mainframe/JTemplate.java

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

@ -600,3 +600,10 @@ FR-Designer_Style=Style
FR-Designer_Color=Color FR-Designer_Color=Color
FR-Designer_Border=Border FR-Designer_Border=Border
FR-Designer_Background-Pattern=Pattern FR-Designer_Background-Pattern=Pattern
FR-Designer_Properties_Mobile=
FR-Designer_Edit_Button_ToolBar=
FR-Designer_Remove_Button_ToolBar=
FR-Designer_Get-CubeGetting=
FR-Designer_Oracle=
FR-Designer_Validate=

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

@ -601,3 +601,11 @@ FR-Designer_Color=Color
FR-Designer_Border=Border FR-Designer_Border=Border
FR-Designer_Background-Pattern=Pattern FR-Designer_Background-Pattern=Pattern
FR-Designer_SimpleDetail_Report=
FR-Designer_SimpleCross_Report=
FR-Designer_Edit_Button_ToolBar=Edit Button ToolBar
FR-Designer_Remove_Button_ToolBar=Remove Button ToolBar
FR-Designer_Get-CubeGetting=
FR-Designer_DoubleLayer_Report=
FR-Designer_Get-Cube=

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

@ -564,4 +564,36 @@ FR-Designer_Chart_F_Radar_Axis=\u5782\u76F4\u8EF8
FR-Designer_Style=\u30B9\u30BF\u30A4\u30EB FR-Designer_Style=\u30B9\u30BF\u30A4\u30EB
FR-Designer_Color=\u8272 FR-Designer_Color=\u8272
FR-Designer_Border=\u67A0 FR-Designer_Border=\u67A0
FR-Designer_Background-Pattern=\u30D1\u30BF\u30FC\u30F3 FR-Designer_Background-Pattern=\u30D1\u30BF\u30FC\u30F3
FR-Designer_Printer_Native_Button=\u30ED\u30FC\u30AB\u30EB\u5370\u5237
FR-Designer_SimpleDetail_Report=\u7C21\u5358\u660E\u7D30\u8868
FR-Designer_Reset=\u30EA\u30BB\u30C3\u30C8
FR-Designer_WidgetOrder=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u306E\u9806\u756A
FR-Designer_Button-OK=\u5206\u304B\u308A\u307E\u3057\u305F
FR-Designer_Mobile-Warning=\u6700\u5927\u306E\u9AD8\u3055\u306F\u8868\u793A\u30A8\u30EA\u30A2\u306E80\uFF05\u4EE5\u4E0A\u306B\u306A\u308A\u307E\u305B\u3093
FR-Designer_Mobile_Form_Analysis_Annotation=\u8AAC\u660E\:\u8A72\u5F53\u8A2D\u5B9A\u3088\u308A\u3001\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u306E\u30A2\u30D7\u30EA\u3067\u306E\u89E3\u6790\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3002
FR-Designer-Invalid_Page_Number=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u756A\u53F7
FR-Designer_Form-Forzen-Speed=\u3001\u305D\u3057\u3066\u6A2A\u65B9\u5411\u81EA\u5DF1\u9069\u5FDC\u307E\u305F\u306F2\u65B9\u5411\u81EA\u52D5\u9069\u5FDC\u3092\u5229\u7528\u3057\u3001\u5E33\u7968\u8868\u793A\u306E\u30B9\u30D4\u30FC\u30C9\u3092\u4E0A\u3052\u3067\u304D\u307E\u3059\u3002
FR-Designer_Properties_Mobile=\u30B9\u30DE\u30FC\u30C8\u30D5\u30A9\u30F3\u5C5E\u6027
FR-Designer_AllCategories=\u5168\u3066\u306E\u7A2E\u985E
FR-Designer-Selected_Widget=\u5F53\u306E\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
FR-Designer_SimpleCross_Report=\u7C21\u5358\u30AF\u30ED\u30FC\u30B9\u8868
FR-Designer_Log=\u30ED\u30B0
FR-Designer_Form-Fit-Tip=\u81EA\u5DF1\u9069\u5FDC\u30D7\u30E9\u30B0\u30A4\u30F3
FR-Designer_Button-Cancel=\u53D6\u308A\u6D88\u3057
FR-Designer_LocalWidget=\u30ED\u30FC\u30AB\u30EB\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u30E9\u30A4\u30D6\u30E9\u30EA
FR-Designer_Alert=\u30A2\u30E9\u30FC\u30C8
FR-Designer_TableData-Default-Para=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF
FR-Designer_Edit_Button_ToolBar=\u30DC\u30BF\u30F3\u306E\u30C4\u30FC\u30EB\u30D0\u30FC\u3092\u7DE8\u96C6
FR-Designer-Plugin_Please_Update_Jar=jar\u30D1\u30C3\u30AF\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044
FR-Designer_Form-Frozen-Tip=\u30D5\u30EA\u30FC\u30BA\u3092\u4F7F\u3046\u6642\u3001\u5F8C\u8A18\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\uFF1A
FR-Designer_Remove_Button_ToolBar=\u30DC\u30BF\u30F3\u306E\u30C4\u30FC\u30EB\u30D0\u30FC\u3092\u524A\u9664
FR-Designer_Normal=\u6B63\u5E38
FR-Designer_Install_Template=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
FR-Designer_Copy=\u30B3\u30D4\u30FC
FR-Designer_Allow-Blank=\u7A7A\u306B\u8A31\u3059
FR-Designer_Clear_All=\u5168\u3066\u3092\u30AF\u30EA\u30A2
FR-Designer_Delete_Template=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u524A\u9664
FR-Designer_Mobile_Report_Analysis_Annotation=\u8AAC\u660E\:\u8A72\u5F53\u5C5E\u6027\u3088\u308A\u3001\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u306E\u30A2\u30D7\u30EA\u3067\u306E\u89E3\u6790\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3001\u9801\u5206\u3051\u30D7\u30EC\u30D3\u30E5\u30FC\u3060\u3051\u3092\u652F\u6301\u3001\u66F8\u304D\u8FBC\u307F\u306B\u8A2D\u5B9A\u3059\u308B\u6642\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002
FR-Designer_DoubleLayer_Report=\u4E8C\u968E\u30BF\u30A4\u30C8\u30EB
FR-Designer_Validate=\u691C\u8A3C

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

@ -559,4 +559,42 @@ FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95
FR-Designer_Style=\uC591\uC2DD FR-Designer_Style=\uC591\uC2DD
FR-Designer_Color=\uC0C9 FR-Designer_Color=\uC0C9
FR-Designer_Border=\uD14C\uB450\uB9AC FR-Designer_Border=\uD14C\uB450\uB9AC
FR-Designer_Background-Pattern=\uC774\uBBF8\uC9C0 FR-Designer_Background-Pattern=\uC774\uBBF8\uC9C0
FR-Designer_COMMUNITY_BUG=
FR-Designer_Mobile-Attr=
FR-Designer_Too_Large_To_Paste=
FR-Designer_COMMUNITY_QUESTIONS=
FR-Designer_COMMUNITY_NEED=
FR-Designer_WidgetOrder=
FR-Designer_Button-OK=
FR-Designer_Mobile-Warning=
FR-Designer_COMMUNITY=
FR-Designer_Mobile_Form_Analysis_Annotation=
FR-Designer-Invalid_Page_Number=
FR-Designer_Form-Forzen-Speed=
FR-Designer_Properties_Mobile=
FR-Designer_AllCategories=
FR-Designer_COMMUNITY_VIDEO=
FR-Designer_Too_Small_To_Paste=
FR-Designer_COMMUNITY_HELP=
FR-Designer_Mobile-Zoom=
FR-Designer_SimpleCross_Report=
FR-Designer_Mobile-Horizontal=
FR-Designer_Form-Fit-Tip=
FR-Designer_Mobile-Vertical=
FR-Designer_Button-Cancel=
FR-Designer_LocalWidget=
FR-Designer_COMMUNITY_SIGN=
FR-Designer_TableData-Default-Para=
FR-Designer_Edit_Button_ToolBar=\uD0A4\uAC00\uC788\uB294\uD234\uBC14\uD3B8\uC9D1
FR-Designer_Mobile-Open=
FR-Designer_Form-Frozen-Tip=
FR-Designer_Remove_Button_ToolBar=\uD0A4\uAC00\uC788\uB294\uD234\uBC14\uC81C\uAC70
FR-Designer_Allow-Blank=
FR-Designer_COMMUNITY_BBS=
FR-Designer_formDesignerModule=
FR-Designer_COMMUNITY_UPDATE=
FR-Designer_Delete_Template=
FR-Designer_Mobile_Report_Analysis_Annotation=
FR-Designer_DoubleLayer_Report=
FR-Designer_Validate=

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

@ -599,4 +599,6 @@ FR-Designer_Chart_F_Radar_Axis=\u503C\u8F74
FR-Designer_Style=\u6837\u5F0F FR-Designer_Style=\u6837\u5F0F
FR-Designer_Color=\u989C\u8272 FR-Designer_Color=\u989C\u8272
FR-Designer_Border=\u8FB9\u6846 FR-Designer_Border=\u8FB9\u6846
FR-Designer_Background-Pattern=\u56FE\u6848 FR-Designer_Background-Pattern=\u56FE\u6848
FR-Designer_Edit_Button_ToolBar=\u7F16\u8F91\u6309\u94AE\u6240\u5728\u5DE5\u5177\u680F
FR-Designer_Remove_Button_ToolBar=\u79FB\u9664\u6309\u94AE\u6240\u5728\u5DE5\u5177\u680F

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

@ -585,4 +585,18 @@ FR-Designer_Chart_F_Radar_Axis=\u503C\u8EF8
FR-Designer_Style=\u6A23\u5F0F FR-Designer_Style=\u6A23\u5F0F
FR-Designer_Color=\u984F\u8272 FR-Designer_Color=\u984F\u8272
FR-Designer_Border=\u6846\u7DDA FR-Designer_Border=\u6846\u7DDA
FR-Designer_Background-Pattern=\u5716\u6848 FR-Designer_Background-Pattern=\u5716\u6848
FR-Designer_SimpleDetail_Report=
FR-Designer_Reset=
FR-Designer_AllCategories=
FR-Designer-Selected_Widget=
FR-Designer_SimpleCross_Report=
FR-Designer_LocalWidget=
FR-Designer_Edit_Button_ToolBar=\u7DE8\u8F2F\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
FR-Designer_Remove_Button_ToolBar=\u79FB\u9664\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
FR-Designer_Install_Template=
FR-Designer_Allow-Blank=
FR-Designer_Delete_Template=
FR-Designer_Download_Template=
FR-Designer_DoubleLayer_Report=
FR-Designer_Validate=

7
designer_base/src/com/fr/design/mainframe/JTemplate.java

@ -529,12 +529,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
} }
protected boolean saveNewFile(FILE editingFILE, String oldName){ protected boolean saveNewFile(FILE editingFILE, String oldName){
this.editingFILE = editingFILE; // 在保存之前,初始化 templateID
initForCollect(); // 如果保存新模板(新建模板直接保存,或者另存为),则添加 templateID
this.editingFILE = editingFILE;
boolean result = this.saveFile(); boolean result = this.saveFile();
if (result) { if (result) {
DesignerFrameFileDealerPane.getInstance().refresh(); DesignerFrameFileDealerPane.getInstance().refresh();
initForCollect(); // 如果保存新模板(新建模板直接保存,或者另存为),则添加 templateID
collectInfo(); collectInfo();
} }
//更换最近打开 //更换最近打开
@ -1028,4 +1029,4 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
return uiButtons; return uiButtons;
} }
} }

Loading…
Cancel
Save