Merge pull request #1626 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'fb5474e816871dc8ded7b1e890b75e647284d588':
  REPORT-29867 fix 更新
  REPORT-29867  进度条弹窗不跟随设计器国际化问题

designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java

@@ -29,11 +29,11 @@ import com.fr.design.gui.itoolbar.UIToolBarBorder;
 import com.fr.design.gui.itoolbar.UIToolBarSeparatorUI;
 import com.fr.design.gui.itooltip.UIToolTipBorder;
 import com.fr.design.gui.itree.UITreeUI;
+import com.fr.design.i18n.Toolkit;
 import com.fr.log.FineLoggerFactory;
 import com.fr.general.IOUtils;
 
-import javax.swing.ImageIcon;
+import javax.swing.*;
-import javax.swing.UIDefaults;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.BorderUIResource;
@@ -52,6 +52,12 @@ import java.net.URL;
  */
 public class UILookAndFeel extends MetalLookAndFeel {
 
+
+    static {
+        UIManager.put("ProgressMonitor.progressText", Toolkit.i18nText("Fine-Design_Basic_ProgressBar_Title"));
+        UIManager.put("OptionPane.cancelButtonText", Toolkit.i18nText("Fine-Design_Basic_Cancel"));
+    }
+
     public static boolean CONTROL_PANEL_INSTANTIATED = false;