Browse Source

Merge pull request #369 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0

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

* commit '3511eae0c878c26ff6620ff1596140fcbdb143e3':
  规范国际化文件及国际化定义。
final/10.0
Alex.Sung 6 years ago
parent
commit
c4ea4538e1
  1. 2
      designer-base/src/main/java/com/fr/start/server/ServerTray.java
  2. 2
      designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java
  3. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  4. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
  5. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java
  6. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java
  7. 2
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

2
designer-base/src/main/java/com/fr/start/server/ServerTray.java

@ -52,7 +52,7 @@ public class ServerTray {
});
startMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Start"));
stopMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Stop"));
MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Exit"));
MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Exit"));
//创建打开监听器
ActionListener startListener = new ActionListener() {

2
designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java

@ -14,7 +14,7 @@ public class DSColumnAdvancedAction extends AbstractCellElementAction {
public DSColumnAdvancedAction(ElementCasePane t) {
super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Advanced"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"));
this.setMnemonic('A');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif"));
}

2
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@ -120,7 +120,7 @@ public class DSColumnAdvancedPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Advanced");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced");
}
public void populate(TemplateCellElement cellElement) {

2
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java

@ -104,7 +104,7 @@ public class DSColumnPane extends BasicPane {
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane);
advancedPane = new DSColumnAdvancedPane(setting);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), advancedPane);
this.setPreferredSize(new Dimension(610, 400));
}

2
designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java

@ -31,7 +31,7 @@ public abstract class ResultSetGroupPane extends JPanel {
protected UIComboBox groupComboBox;
protected ResultSetGroupPane(){
groupComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Continuum"), com.fr.design.i18n.Toolkit.i18nText("Advanced")});
groupComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Continuum"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced")});
}
abstract void populate(TemplateCellElement cellElement);

2
designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java

@ -286,7 +286,7 @@ public class HFContainer extends JPanel implements Scrollable {
int returnVal = JOptionPane.showConfirmDialog(
SwingUtilities.getWindowAncestor(HFContainer.this),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Are_You_Sure_To_Delete_It") + "?",
com.fr.design.i18n.Toolkit.i18nText("Delete"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"),
JOptionPane.OK_CANCEL_OPTION,
JOptionPane.QUESTION_MESSAGE);

2
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -1072,7 +1072,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
textFieldPane.add(formulaTextField, BorderLayout.CENTER);
textFieldPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
UIButton formulaButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "...");
formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula") + "...");
formulaButton.setPreferredSize(new Dimension(20, formulaTextField.getPreferredSize().height));
formulaButton.addActionListener(formulaButtonActionListener);

Loading…
Cancel
Save