From 45af5555831238eacf247f57c8aa4f2429bf2e8b Mon Sep 17 00:00:00 2001 From: anchore Date: Thu, 17 Nov 2016 13:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/DesignerFrameFileDealerPane.java | 2 +- designer_base/src/com/fr/design/menu/KeySetUtils.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 7ede19d517..093f90e5a5 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -415,7 +415,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt UIButton cancelButton = new UIButton(Inter.getLocText("FR-Designer_Cancel")); // mod by anchore 16/11/16 - if (Locale.JAPAN.equals(GeneralContext.getLocale())) { + if (ComparatorUtils.equals(Locale.JAPAN, GeneralContext.getLocale())) { cancelButton.setBounds(250, 90, 80, 25); } else { cancelButton.setBounds(180, 90, 80, 25); diff --git a/designer_base/src/com/fr/design/menu/KeySetUtils.java b/designer_base/src/com/fr/design/menu/KeySetUtils.java index 91840bcdcb..ac9314b5ab 100644 --- a/designer_base/src/com/fr/design/menu/KeySetUtils.java +++ b/designer_base/src/com/fr/design/menu/KeySetUtils.java @@ -4,6 +4,7 @@ package com.fr.design.menu; +import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.Inter; @@ -714,10 +715,10 @@ public class KeySetUtils { public String getMenuName() { // mod by anchore 16/11/16 - if (Locale.JAPAN.equals(GeneralContext.getLocale())) { - return Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"}) + "に" + Inter.getLocText("Allow"); + if (ComparatorUtils.equals(Locale.JAPAN, GeneralContext.getLocale())) { + return Inter.getLocText(new String[]{"FR-Engine_RP_Authority_Edit", "Allow"}); } else { - return Inter.getLocText(new String[]{"Allow", "DashBoard-Potence", "Edit"}); + return Inter.getLocText(new String[]{"Allow", "FR-Engine_RP_Authority_Edit"}); } //return Inter.getLocText(new String[]{"Allow", "DashBoard-Potence", "Edit"}); }