diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index 12d4ff74b..ba55c8214 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -25,6 +25,7 @@ import com.fr.form.main.Form; import com.fr.form.main.FormIO; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; +import com.fr.general.Inter; import com.fr.io.TemplateWorkBookIO; import com.fr.io.exporter.ImageExporter; import com.fr.main.impl.WorkBook; @@ -367,12 +368,12 @@ public class AlphaFineDialog extends UIDialog { } private void HandleMoreOrLessResult(int index, MoreModel selectedValue) { - if (selectedValue.getContent().equals("显示全部")) { - selectedValue.setContent("收起"); + if (selectedValue.getContent().equals(Inter.getLocText("FR-Designer_AlphaFine_ShowAll"))) { + selectedValue.setContent(Inter.getLocText("FR-Designer_AlphaFine_ShowLess")); rebuildList(index, selectedValue); } else { - selectedValue.setContent("显示全部"); + selectedValue.setContent(Inter.getLocText("FR-Designer_AlphaFine_ShowAll")); rebuildList(index, selectedValue); } } @@ -541,7 +542,7 @@ public class AlphaFineDialog extends UIDialog { private void rebuildList(int index, MoreModel selectedValue) { SearchResult moreResult = getMoreResult(selectedValue); - if((selectedValue).getContent().equals("收起")) { + if((selectedValue).getContent().equals(Inter.getLocText("FR-Designer_AlphaFine_ShowLess"))) { for (int i = 0; i < moreResult.size(); i++) { this.searchListModel.insertElementAt(moreResult.get(i), index + 4 + i); } diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/ActionSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/searchManager/ActionSearchManager.java index a2caf0531..9494cf021 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/ActionSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/searchManager/ActionSearchManager.java @@ -7,6 +7,7 @@ import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; import com.fr.design.mainframe.alphafine.cell.cellModel.ActionModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.design.mainframe.toolbar.UpdateActionManager; +import com.fr.general.Inter; import java.util.List; @@ -47,9 +48,9 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { } if (filterModelList.size() > 0) { if (filterModelList.size() > 5) { - lessModelList.add(0, new MoreModel("设置", "显示全部",true, CellType.ACTION)); + lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.ACTION)); } else { - lessModelList.add(0, new MoreModel("设置", CellType.ACTION)); + lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"), CellType.ACTION)); } } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaSearchManager.java index 2b840615b..a5e862e55 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaSearchManager.java @@ -3,6 +3,7 @@ package com.fr.design.mainframe.alphafine.searchManager; import com.fr.design.mainframe.alphafine.AlphaFineHelper; import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; +import com.fr.general.Inter; import java.io.*; @@ -54,12 +55,12 @@ public class AlphaSearchManager implements AlphaFineSearchProcessor { public SearchResult showDefaultSearchResult() { SearchResult searchResult = new SearchResult(); - searchResult.add(new MoreModel("本地常用")); - searchResult.add(new MoreModel("猜您喜欢")); - searchResult.add(new MoreModel("设置")); - searchResult.add(new MoreModel("模板")); - searchResult.add(new MoreModel("帮助文档")); - searchResult.add(new MoreModel("应用中心")); + searchResult.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Latest"))); + searchResult.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Conclude"))); + searchResult.add(new MoreModel(Inter.getLocText("FR-Designer_Set"))); + searchResult.add(new MoreModel(Inter.getLocText("FR-Designer_Templates"))); + searchResult.add(new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"))); + searchResult.add(new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"))); return searchResult; } diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/ConcludeSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/searchManager/ConcludeSearchManager.java index 6ba74b6a0..e4ab5ef48 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/ConcludeSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/searchManager/ConcludeSearchManager.java @@ -2,6 +2,7 @@ package com.fr.design.mainframe.alphafine.searchManager; import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; +import com.fr.general.Inter; /** * Created by XiaXiang on 2017/3/31. @@ -20,7 +21,7 @@ public class ConcludeSearchManager implements AlphaFineSearchProcessor { public synchronized SearchResult showLessSearchResult(String searchText) { //todo: 猜您喜欢逻辑需要重新设计 this.modelList = new SearchResult(); - modelList.add(new MoreModel("猜您需要", false)); + modelList.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Conclude"), false)); return modelList; } diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/searchManager/DocumentSearchManager.java index a5af9be28..7273caed5 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/searchManager/DocumentSearchManager.java @@ -7,6 +7,7 @@ import com.fr.design.mainframe.alphafine.cell.cellModel.DocumentModel; import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.general.FRLogger; +import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; @@ -49,9 +50,9 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { } if (jsonArray.length() > 0) { if (jsonArray.length() > 5) { - lessModelList.add(new MoreModel("帮助文档", "显示全部",true, CellType.DOCUMENT)); + lessModelList.add(new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.DOCUMENT)); } else { - lessModelList.add(new MoreModel("帮助文档", CellType.DOCUMENT)); + lessModelList.add(new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), CellType.DOCUMENT)); } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/searchManager/FileSearchManager.java index 29bfba0bd..496405e59 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/searchManager/FileSearchManager.java @@ -10,6 +10,7 @@ import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.file.filetree.FileNode; import com.fr.general.FRLogger; +import com.fr.general.Inter; import com.fr.stable.StableUtils; import com.fr.stable.project.ProjectConstants; @@ -93,9 +94,9 @@ public class FileSearchManager implements AlphaFineSearchProcessor { } if (filterModelList.size() > 0) { if (filterModelList.size() > AlphaFineConstants.SHOW_SIZE) { - lessModelList.add(0,new MoreModel("模板", "显示全部",true, CellType.FILE)); + lessModelList.add(0,new MoreModel(Inter.getLocText("FR-Designer_Templates"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.FILE)); } else { - lessModelList.add(0,new MoreModel("模板", CellType.FILE)); + lessModelList.add(0,new MoreModel(Inter.getLocText("FR-Designer_Templates"), CellType.FILE)); } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/LatestSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/searchManager/LatestSearchManager.java index 6ea7d4914..8fb391946 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/LatestSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/searchManager/LatestSearchManager.java @@ -2,6 +2,7 @@ package com.fr.design.mainframe.alphafine.searchManager; import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; +import com.fr.general.Inter; /** * Created by XiaXiang on 2017/3/31. @@ -20,8 +21,8 @@ public class LatestSearchManager implements AlphaFineSearchProcessor { @Override public synchronized SearchResult showLessSearchResult(String searchText) { this.modelList = new SearchResult(); - modelList.add(new MoreModel("本地常用", false)); - //todo: 常用逻辑需要重新设计 + modelList.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Latest"), false)); + //todo: 本地常用逻辑需要重新设计 // if (getLatestModelList() != null && getLatestModelList().size() > 0) { // modelList.addAll(getLatestModelList()); // } diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/searchManager/PluginSearchManager.java index d0dd49780..b43317f06 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/searchManager/PluginSearchManager.java @@ -8,6 +8,7 @@ import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; +import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; @@ -52,9 +53,9 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { } if (jsonArray.length() > 0) { if (jsonArray.length() > AlphaFineConstants.SHOW_SIZE) { - lessModelList.add(new MoreModel("应用中心", "显示全部",true, CellType.PLUGIN)); + lessModelList.add(new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.PLUGIN)); } else { - lessModelList.add(new MoreModel("应用中心", CellType.PLUGIN)); + lessModelList.add(new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), CellType.PLUGIN)); } } diff --git a/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigPane.java b/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigPane.java index c0c8c6bd1..282b47605 100644 --- a/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigPane.java +++ b/designer_base/src/com/fr/design/actions/help/AlphaFine/AlphafineConfigPane.java @@ -78,20 +78,20 @@ public class AlphafineConfigPane extends BasicPane { double[] rowSize = {p, p}; double[] columnSize = {d, d, d}; - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane("搜索范围"); - isContainConcludeCheckbox = new UICheckBox("猜您需要"); - isContainActionCheckbox = new UICheckBox("设置"); - isContainPluginCheckbox = new UICheckBox("应用中心"); - isContainDocumentCheckbox = new UICheckBox("帮助文档"); - isContainTemplateCheckbox = new UICheckBox("模板"); - isContainFileContentCheckbox = new UICheckBox("模板内容"); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_SearchRange")); + isContainConcludeCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_AlphaFine_Conclude")); + isContainActionCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_Set")); + isContainPluginCheckbox = new UICheckBox(Inter.getLocText("FR-Designer-Plugin_Addon")); + isContainDocumentCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_COMMUNITY_HELP")); + isContainTemplateCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_Templates")); + isContainFileContentCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_Templates_Content")); JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initsearchRangeComponents(), rowSize, columnSize); northPane.add(searchConfigPane); contentPane.add(northPane); } private void createShortcutsPane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane("快捷键配置"); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_Shortcut_Config")); shortcutsField = new UITextField(); shortcutsField.setPreferredSize(new Dimension(100, 20)); shortcutsField.addKeyListener(new KeyAdapter() { @@ -107,14 +107,14 @@ public class AlphafineConfigPane extends BasicPane { shortcutsField.setText(getDisplayShortCut(str)); } }); - northPane.add(new UILabel(Inter.getLocText("Open") + ":")); + northPane.add(new UILabel(Inter.getLocText("FR-Designer_Open") + ":")); northPane.add(shortcutsField); contentPane.add(northPane); } private void createOnlinePane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane("联网"); - isSearchOnlineCheckbox = new UICheckBox("联网搜索"); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_EnableInternet")); + isSearchOnlineCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_AlphaFine_EnableInternetSearch")); isSearchOnlineCheckbox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -137,8 +137,8 @@ public class AlphafineConfigPane extends BasicPane { } private void createOpenPane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane("开启"); - isEnabledCheckbox = new UICheckBox("开启AlphaFine功能"); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_Enable")); + isEnabledCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_AlphaFine_EnableAlphaFine")); northPane.add(isEnabledCheckbox); contentPane.add(northPane); } diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 3f809fb4a..7c055ee76 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -538,4 +538,17 @@ FR-Designer_Allow_Blank=Allow Blank FR-Designer_PageSetup_Page=Page FR-Designer_Custom_Job_Description=Description FR-Designer_Property=Property -FR-Designer_ClassName=Class Name \ No newline at end of file +FR-Designer_ClassName=Class Name +FR-Designer_AlphaFine_Enable=enable +FR-Designer_AlphaFine_EnableAlphaFine=FR-Designer_AlphaFine_EnableAlphaFine +FR-Designer_AlphaFine_EnableInternet=Designer_AlphaFine_EnableInternet +FR-Designer_AlphaFine_EnableInternetSearch= +FR-Designer_AlphaFine_Shortcut_Config= +FR-Designer_AlphaFine_SearchRange= +FR-Designer_AlphaFine_Conclude= +FR-Designer-Plugin_Addon= +FR-Designer_Templates=FR-Designer_Templates +FR-Designer_Templates_Content= +FR-Designer_AlphaFine_ShowAll= +FR-Designer_AlphaFine_Latest= +FR-Designer_AlphaFine_ShowLess= \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 30db869a2..e1f77a53e 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -539,3 +539,7 @@ FR-Designer_PageSetup_Page=Page FR-Designer_Custom_Job_Description=Description FR-Designer_Property=Property FR-Designer_ClassName=Class Name +FR-Designer_AlphaFine_Enable=enable +FR-Designer_AlphaFine_EnableAlphaFine=Enable AlphaFine +FR-Designer_AlphaFine_EnableInternet=EnableInternet +FR-Designer_Templates=Templates diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 54f0ac177..a43dc320a 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -543,4 +543,17 @@ FR-Designer_PageSetup_Page=\u9875\u9762 FR-Designer_Custom_Job_Description=\u63CF\u8FF0 FR-Designer_Property=\u5C5E\u6027 FR-Designer_ClassName=\u7C7B\u540D +FR-Designer_AlphaFine_Enable=\u5F00\u542F +FR-Designer_AlphaFine_EnableAlphaFine=\u5F00\u542FAlphaFine\u529F\u80FD +FR-Designer_AlphaFine_EnableInternet=\u8054\u7F51 +FR-Designer_AlphaFine_EnableInternetSearch=\u8054\u7F51\u641C\u7D22 +FR-Designer_AlphaFine_Shortcut_Config=\u5FEB\u6377\u952E\u914D\u7F6E +FR-Designer_AlphaFine_SearchRange=\u641C\u7D22\u8303\u56F4 +FR-Designer-Plugin_Addon=\u5E94\u7528\u4E2D\u5FC3 +FR-Designer_Templates=\u6A21\u677F +FR-Designer_Templates_Content=\u6A21\u677F\u5185\u5BB9 +FR-Designer_AlphaFine_ShowAll=\u663E\u793A\u5168\u90E8 +FR-Designer_AlphaFine_Conclude=\u731C\u60A8\u9700\u8981 +FR-Designer_AlphaFine_Latest=\u6700\u8FD1\u5E38\u7528 +FR-Designer_AlphaFine_ShowLess=\u6536\u8D77