fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

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

* commit 'b79fe1f925d8c3c1f8bd2c9fd7031e6f415ba4ab':
  根据国际化规范，修改不合理地方。
  规范国际化文件及国际化定义。
research/10.0
ju 6 years ago
parent
b5f27c145c b79fe1f925
commit
76d2ec0f42
14 changed files with 51 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
  3. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
  4. 5
      designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RUndoManager.java
  5. 2
      designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java
  6. 20
      designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java
  7. 6
      designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java
  8. 2
      designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java
  9. 2
      designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java
  10. 2
      designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java
  11. 50
      designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java
  12. 2
      designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java
  13. 2
      designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java
  14. 4
      designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

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

@ -58,7 +58,7 @@ public class AboutPane extends JPanel {
BoxCenterAligmentPane boxCenterAlignmentPane = new BoxCenterAligmentPane(getCopyRight());
contentPane.add(boxCenterAlignmentPane);
boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("About-All_Rights_Reserved"));
boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_All_Rights_Reserved"));
contentPane.add(boxCenterAlignmentPane);
contentPane.add(new BoxCenterAlignmentCopyablePane(

2
designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
Unescape View File

@ -124,7 +124,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
boolean result = isExistedInParentTreeNode(parentTreeNode, newJoinCondition);
if (result) {
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
com.fr.design.i18n.Toolkit.i18nText("BindColumn-This_Condition_has_been_existed"));
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BindColumn_This_Condition_Has_Been_Existed"));
return;
}

2
designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
Unescape View File

@ -129,7 +129,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
setAddEnabled(false);
}
} else {
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Already_exists_not_add_repeat")+"!");
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Already_Exists_Not_Add_Repeat")+"!");
}
}
});

5
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RUndoManager.java
Unescape View File

@ -10,7 +10,6 @@ package com.fr.design.gui.syntax.ui.rtextarea;
import java.util.ResourceBundle;
import javax.swing.Action;
import javax.swing.UIManager;
import javax.swing.event.UndoableEditEvent;
@ -49,8 +48,8 @@ public class RUndoManager extends UndoManager {
*/
public RUndoManager(RTextArea textArea) {
this.textArea = textArea;
cantUndoText = com.fr.design.i18n.Toolkit.i18nText("Action.CantUndo.Name");
cantRedoText = com.fr.design.i18n.Toolkit.i18nText("Action.CantRedo.Name");
cantUndoText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Cant_Undo_Name");
cantRedoText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Cant_Redo_Name");
}

2
designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java
Unescape View File

@ -48,7 +48,7 @@ public class NullBackgroundQuickPane extends BackgroundQuickPane {
* @return 名称
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Background-Null");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null");
}
@Override

20
designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java
Unescape View File

@ -150,15 +150,15 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane {
TextureBackground.WOVEN_MAT_TEXTURE_PAINT, TextureBackground.WATER_DROPLETS_TEXTURE_PAINT, TextureBackground.PAPER_BAG_TEXTURE_PAINT, TextureBackground.FISH_FOSSIL_TEXTURE_PAINT,
TextureBackground.SAND_TEXTURE_PAINT, TextureBackground.CORK_TEXTURE_PAINT, TextureBackground.WALNUT_TEXTURE_PAINT, TextureBackground.OAK_TEXTURE_PAINT,
TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT};
private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Newsprint"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-RecycledPaper"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Parchment"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Stationery"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-GreenMarble"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WhiteMarble"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BrownMarble"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Granite"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BlueTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PinkTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PurpleMesh"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Bouquet"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Papyrus"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Canvas"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Denim"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WovenMat"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WaterDroplets"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PaperBag"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-FishFossil"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Sand"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Cork"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Walnut"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Oak"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-MediumWood")};
private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Newsprint"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Recycled_Paper"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Parchment"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Stationery"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Green_Marble"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_White_Marble"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Brown_Marble"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Granite"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Blue_Tissue_Paper"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Pink_Tissue_Paper"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Purple_Mesh"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Bouquet"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Papyrus"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Canvas"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Denim"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Woven_Mat"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Water_Droplets"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_PaperBag"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_FishFossil"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Sand"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Cork"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Walnut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Oak"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Medium_Wood")};
@Override
public boolean accept(Background background) {
@ -167,7 +167,7 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane {
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Background-Texture");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
}
@Override

6
designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java
Unescape View File

@ -27,15 +27,15 @@ public class BackgroundWrapper implements Encoder, Decoder {
if (v instanceof ColorBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Color");
} else if (v instanceof TextureBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Background-Texture");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
} else if (v instanceof PatternBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
} else if (v instanceof ImageFileBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Image");
} else if (v instanceof GradientBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
} else {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
return com.fr.design.i18n.Toolkit.i18nText("None");
}
}

2
designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java
Unescape View File

@ -38,7 +38,7 @@ public class BackgroundPreviewLabel extends UILabel {
this.getSize().getWidth(), this.getSize().getHeight()));
this.setText("");
} else {
this.setText(com.fr.design.i18n.Toolkit.i18nText("Background-Background_is_NULL") + "...");
this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Background_Is_Null") + "...");
}
}

2
designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java
Unescape View File

@ -19,7 +19,7 @@ public class NullBackgroundPane extends BackgroundDetailPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
UILabel centerLabel = new UILabel(
com.fr.design.i18n.Toolkit.i18nText("Background-Background_is_NULL") + "...");
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Background_Is_Null") + "...");
this.add(centerLabel);
centerLabel.setHorizontalAlignment(SwingConstants.CENTER);
centerLabel.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor()));

2
designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java
Unescape View File

@ -45,7 +45,7 @@ public class PatternBackgroundPane extends BPane {
}
protected String titleOfTypePane() {
return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
}
protected LayoutManager layoutOfTypePane(int nColumn) {
return FRGUIPaneFactory.createNColumnGridLayout(nColumn);

50
designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java
Unescape View File

@ -47,30 +47,30 @@ public class TextureBackgroundPane extends BPane {
TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT};
private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Newsprint"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-RecycledPaper"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Parchment"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Stationery"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-GreenMarble"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WhiteMarble"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BrownMarble"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Granite"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BlueTissuePaper"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PinkTissuePaper"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PurpleMesh"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Bouquet"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Papyrus"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Canvas"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Denim"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WovenMat"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WaterDroplets"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PaperBag"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-FishFossil"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Sand"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Cork"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Walnut"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Oak"),
com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-MediumWood")
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Newsprint"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Recycled_Paper"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Parchment"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Stationery"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Green_Marble"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_White_Marble"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Brown_Marble"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Granite"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Blue_Tissue_Paper"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Pink_Tissue_Paper"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Purple_Mesh"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Bouquet"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Papyrus"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Canvas"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Denim"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Woven_Mat"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Water_Droplets"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_PaperBag"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_FishFossil"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Sand"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Cork"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Walnut"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Oak"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Medium_Wood")
};
private TexturePaint texturePaint;
@ -89,7 +89,7 @@ public class TextureBackgroundPane extends BPane {
}
protected String titleOfTypePane() {
return com.fr.design.i18n.Toolkit.i18nText("Background-Texture");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
}
protected void setChildrenOfTypePane(JPanel typePane2) {
ButtonGroup patternButtonGroup = new ButtonGroup();

2
designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java
Unescape View File

@ -28,7 +28,7 @@ public class PatternSelectPane extends BackgroundSelectPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
}
}

2
designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java
Unescape View File

@ -27,6 +27,6 @@ public class TextureSelectPane extends BackgroundSelectPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Background-Texture");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
}
}

4
designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
Unescape View File

@ -53,11 +53,11 @@ public class NumberEditorValidatePane extends JPanel {
private void initComponent() {
initListeners();
this.allowDecimalsCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Allow_Decimals"));
this.allowDecimalsCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Decimals"));
allowDecimalsCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
this.allowDecimalsCheckBox.addActionListener(allowDecimalsListener);
this.decimalLength = new UISpinner(0, Integer.MAX_VALUE, 1, 16);
this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Allow_Negative"));
this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Negative"));
this.allowNegativeCheckBox.addActionListener(allowNegativeListener);
allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
this.setMaxValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Need_Max_Value"), false);

Write Preview
Loading…
Cancel
Save