Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容

final/10.0
Harrison 6 years ago
parent
964d0778a6
commit
8658b0407c
12 changed files with 20 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
  2. 2
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
  3. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  4. 2
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
  5. 4
      designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
  6. 4
      designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java
  7. 13
      designer-base/src/main/java/com/fr/start/ServerStarter.java
  8. 2
      designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
  9. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/component/TabFitLayoutBackgroundPane.java
  10. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WTitleLayoutDefinePane.java
  11. 6
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java
  12. 6
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java

2
designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
Unescape View File

@ -45,7 +45,7 @@ public class VideoAction extends UpdateAction
try { try {
Desktop.getDesktop().browse(new URI(url)); Desktop.getDesktop().browse(new URI(url));
} catch (IOException exp) { } catch (IOException exp) {
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser")); JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate"));
FineLoggerFactory.getLogger().error(exp.getMessage(), exp); FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
} catch (URISyntaxException exp) { } catch (URISyntaxException exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp); FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

2
designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
Unescape View File

@ -89,7 +89,7 @@ public class AlphaFineConfigPane extends BasicPane {
JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range")); JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range"));
isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Recommend")); isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Recommend"));
isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")); isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"));
isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Addon")); isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Addon"));
isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help")); isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"));
isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Templates")); isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Templates"));

4
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
Unescape View File

@ -151,7 +151,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
JPanel setPanel = new JPanel(); JPanel setPanel = new JPanel();
southPanel.add(setPanel, BorderLayout.CENTER); southPanel.add(setPanel, BorderLayout.CENTER);
setPanel.setPreferredSize(new Dimension(setPanelWidth, 460)); setPanel.setPreferredSize(new Dimension(setPanelWidth, 460));
setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"))); setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set")));
JPanel controlPane = textSetPanel(width,height); JPanel controlPane = textSetPanel(width,height);
setPanel.add(controlPane, BorderLayout.NORTH); setPanel.add(controlPane, BorderLayout.NORTH);
fileTypeComboBox.addActionListener(getFileTypeListener(setPanel,width,height)); fileTypeComboBox.addActionListener(getFileTypeListener(setPanel,width,height));
@ -176,7 +176,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
urlText = new UITextField(); urlText = new UITextField();
urlText.setPreferredSize(new Dimension(195, 20)); urlText.setPreferredSize(new Dimension(195, 20));
urlText.setEditable(false); urlText.setEditable(false);
chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Selection")); chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Selection"));
chooseFile.addActionListener(chooseFileListener); chooseFile.addActionListener(chooseFileListener);
testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection")); testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));

2
designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
Unescape View File

@ -167,7 +167,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
this.addMouseMotionListener(this); this.addMouseMotionListener(this);
this.setBorder(null); this.setBorder(null);
this.setForeground(new Color(58, 56, 58)); this.setForeground(new Color(58, 56, 58));
this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Song_TypeFace"), 0, 12)); this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Song_TypeFace"), 0, 12));
openedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); openedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
selectedIndex = openedTemplate.size() - 1; selectedIndex = openedTemplate.size() - 1;
Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK); Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK);

4
designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
Unescape View File

@ -76,7 +76,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null, null}, new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style") + " ", SwingConstants.LEFT), currentLineCombo}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style") + " ", SwingConstants.LEFT), currentLineCombo},
new Component[]{null, null}, new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + " ", SwingConstants.LEFT), currentLineColorPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + " ", SwingConstants.LEFT), currentLineColorPane},
new Component[]{null, null}, new Component[]{null, null},
@ -250,4 +250,4 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
public void setGlobalName(String name) { public void setGlobalName(String name) {
} }
} }

4
designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java
Unescape View File

@ -47,7 +47,7 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
set.setMargin(null); set.setMargin(null);
set.setOpaque(false); set.setOpaque(false);
set.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); set.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
set.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")); set.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"));
this.add(clear); this.add(clear);
this.add(selectedall); this.add(selectedall);
@ -181,4 +181,4 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
private static final int SET_OFFSET = 70; private static final int SET_OFFSET = 70;
} }
} }

13
designer-base/src/main/java/com/fr/start/ServerStarter.java
Unescape View File

@ -2,21 +2,12 @@ package com.fr.start;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.base.ServerConfig; import com.fr.base.ServerConfig;
import com.fr.design.DesignModelAdapter;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.data.datapane.TableDataTreePane;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.env.DesignerWorkspaceGenerator;
import com.fr.design.file.TemplateTreePane;
import com.fr.design.gui.itextarea.UITextArea;
import com.fr.design.mainframe.DesignerContext;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext; import com.fr.general.GeneralContext;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.OperatingSystem; import com.fr.stable.OperatingSystem;
import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils; import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.start.server.FineEmbedServer; import com.fr.start.server.FineEmbedServer;
@ -98,7 +89,7 @@ public class ServerStarter {
// win10 内存用到到80%左右的时候, Desktop.browser经常提示"存储空间不足, 无法处理改命令", 用rundll32可以打开. // win10 内存用到到80%左右的时候, Desktop.browser经常提示"存储空间不足, 无法处理改命令", 用rundll32可以打开.
Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri); Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri);
} catch (IOException ee) { } catch (IOException ee) {
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser")); JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate"));
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
} else { } else {
@ -107,4 +98,4 @@ public class ServerStarter {
} }
} }

2
designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
Unescape View File

@ -306,7 +306,7 @@ public class FormWidgetDetailPane extends FormDockView{
try { try {
Desktop.getDesktop().browse(new URI(url)); Desktop.getDesktop().browse(new URI(url));
} catch (IOException exp) { } catch (IOException exp) {
JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser")); JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate"));
FineLoggerFactory.getLogger().error(exp.getMessage(), exp); FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
} catch (URISyntaxException exp) { } catch (URISyntaxException exp) {
FineLoggerFactory.getLogger().error(exp.getMessage(), exp); FineLoggerFactory.getLogger().error(exp.getMessage(), exp);

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/component/TabFitLayoutBackgroundPane.java
Unescape View File

@ -62,7 +62,7 @@ public class TabFitLayoutBackgroundPane extends BackgroundCompPane<WTabFitLayout
} }
protected UILabel createUILable(){ protected UILabel createUILable(){
return new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style")); return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style"));
} }
protected String title4PopupWindow() { protected String title4PopupWindow() {

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WTitleLayoutDefinePane.java
Unescape View File

@ -41,7 +41,7 @@ public abstract class WTitleLayoutDefinePane<T extends AbstractBorderStyleWidget
double[] columnSize = {p, f}; double[] columnSize = {p, f};
int[][] rowCount = {{1, 1}}; int[][] rowCount = {{1, 1}};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style")), borderStyleEditor} new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style")), borderStyleEditor}
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));

6
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java
Unescape View File

@ -62,7 +62,7 @@ public class ActionSearchManager implements AlphaFineSearchProvider {
lessModelList = new SearchResult(); lessModelList = new SearchResult();
moreModelList = new SearchResult(); moreModelList = new SearchResult();
if (StringUtils.isBlank(searchText)) { if (StringUtils.isBlank(searchText)) {
lessModelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"))); lessModelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set")));
return lessModelList; return lessModelList;
} }
if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainAction()) { if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainAction()) {
@ -84,10 +84,10 @@ public class ActionSearchManager implements AlphaFineSearchProvider {
if (result.isEmpty()) { if (result.isEmpty()) {
return lessModelList; return lessModelList;
} else if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) { } else if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) {
lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"))); lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set")));
lessModelList.addAll(result); lessModelList.addAll(result);
} else { } else {
lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.ACTION)); lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.ACTION));
lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE)); lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE));
moreModelList.addAll(result.subList(AlphaFineConstants.SHOW_SIZE, result.size())); moreModelList.addAll(result.subList(AlphaFineConstants.SHOW_SIZE, result.size()));
} }

6
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java
Unescape View File

@ -56,7 +56,7 @@ public class CellStylePane extends AbstractCellAttrPane {
@Override @Override
public String getIconPath() { public String getIconPath() {
// return "com/fr/design/images/m_format/cell.png"; // return "com/fr/design/images/m_format/cell.png";
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style");
} }
@ -121,11 +121,11 @@ public class CellStylePane extends AbstractCellAttrPane {
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style")); return com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style"));
} }
public void setSelectedByIds(int level, String... id) { public void setSelectedByIds(int level, String... id) {
stylePane.setSelctedByName(id[level]); stylePane.setSelctedByName(id[level]);
} }
} }

Write Preview
Loading…
Cancel
Save