From 3094a14a66d19ee7a1f7da52dc2621a688d3d2ae Mon Sep 17 00:00:00 2001 From: bryant Date: Mon, 2 Nov 2020 11:10:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-42551=20&=20REPORT-42552=20=E6=97=A5?= =?UTF-8?q?=E6=96=87=E5=B1=8F=E8=94=BD=E6=9B=B4=E6=96=B0=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 4 +++- designer-base/src/main/java/com/fr/design/upm/UpmFinder.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 53bf18bce..25f874993 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -541,7 +541,9 @@ public abstract class ToolBarMenuDock { //远程不使用更新升级，产品演示 if (WorkContext.getCurrent().isLocal()) { shortCuts.add(new WebDemoAction()); - LocaleCenter.buildAction(() -> shortCuts.add(new SoftwareUpdateAction()), SupportLocaleImpl.UPDATE_HELP); + if (!Locale.getDefault().equals(Locale.JAPAN) && !Locale.getDefault().equals(Locale.JAPANESE)) { + LocaleCenter.buildAction(() -> shortCuts.add(new SoftwareUpdateAction()), SupportLocaleImpl.UPDATE_HELP); + } } if (AlphaFineConfigManager.isALPHALicAvailable()) { shortCuts.add(new AlphaFineAction()); diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java index 2aaa9556b..4424d9d74 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java @@ -101,7 +101,8 @@ public class UpmFinder { private static void showUpdatePane() { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Update_Info_Plugin_Message")); - if (!GeneralContext.getLocale().equals(Locale.JAPAN)) { + if (!GeneralContext.getLocale().equals(Locale.JAPANESE) && !GeneralContext.getLocale().equals(Locale.JAPAN) + && !Locale.getDefault().equals(Locale.JAPAN) && !Locale.getDefault().equals(Locale.JAPANESE)) { UpdateMainDialog dialog = new UpdateMainDialog(DesignerContext.getDesignerFrame()); dialog.setAutoUpdateAfterInit(); dialog.showDialog(); From 9d402045f6db0b6e5945474ce264277b17d3b5a0 Mon Sep 17 00:00:00 2001 From: bryant Date: Mon, 2 Nov 2020 14:57:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-42551=20&=20REPORT-42552=20=E6=97=A5?= =?UTF-8?q?=E6=96=87=E5=B1=8F=E8=94=BD=E6=9B=B4=E6=96=B0=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/locale/impl/SupportLocaleImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java b/designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java index d026138a7..39bad349a 100644 --- a/designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java +++ b/designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java @@ -156,5 +156,20 @@ public enum SupportLocaleImpl implements SupportLocale { set.add(Locale.TAIWAN); return set; } + }, + + /** + * 更新升级-社区菜单下 + */ + UPDATE_COMMUNITY { + @Override + public Set support() { + Set set = new HashSet<>(); + set.add(Locale.US); + set.add(Locale.KOREA); + set.add(Locale.CHINA); + set.add(Locale.TAIWAN); + return set; + } } }