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

Pull request #10541: REPORT-83624 模板查找替换提示语句key合并 

Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0

* commit '9eeede7f68cf61766f2b36766ed96271b993853a':
  REPORT-83624 模板查找替换提示语句key合并
newui
Destiny.Lin-林锦龙 2 years ago
parent
a10dd17d9e 9eeede7f68
commit
d6b8141725
1 changed files with 1 additions and 1 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-realize/src/main/java/com/fr/design/actions/replace/ui/ITCheckDialog.java

2
designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITCheckDialog.java
Unescape View File

@ -44,7 +44,7 @@ public class ITCheckDialog extends UIDialog {
editorPane = new UITableEditorPane(editor); editorPane = new UITableEditorPane(editor);
editor.add(ITReplaceMainDialog.getCheckValidList()); editor.add(ITReplaceMainDialog.getCheckValidList());
UILabel label = new UILabel("<html>" + Toolkit.i18nText("Fine-Design_Replace_Check") + "<font color = 'rgb(236,124,125)'>" + ITReplaceMainDialog.contentReplaceFailedCount + "</font>" + Toolkit.i18nText("Fine-Design_Replace_Check_Tip")); UILabel label = new UILabel("<html>" + Toolkit.i18nText("Fine-Design_Replace_Check", "<font color = 'rgb(236,124,125)'>" + ITReplaceMainDialog.contentReplaceFailedCount + "</font>"));
JPanel center = new JPanel(new BorderLayout()); JPanel center = new JPanel(new BorderLayout());
UIButton location = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Location")); UIButton location = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Location"));
UIButton cancel = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); UIButton cancel = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));

Write Preview
Loading…
Cancel
Save