From 57aa1021eb53850cf9b0c987c3fa1c8c405e3632 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 17 Aug 2018 12:01:19 +0800
Subject: [PATCH] =?UTF-8?q?DEC-3945=20=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=84=9A=E6=9C=AC=E7=9A=84=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E7=8B=AC=E7=AB=8B=E5=88=B0scripts=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/extra/PluginWebBridge.java    | 8 --------
 .../src/main/java/com/fr/design/extra/PluginWebPane.java  | 3 +++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
index ba2ee26f34..de96c10b9b 100644
--- a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
@@ -53,7 +53,6 @@ public class PluginWebBridge {
     private static final String PLUGIN_INFO = "pluginInfo";
     private static final int COREPOOLSIZE = 3;
     private static final int MAXPOOLSIZE = 5;
-    private static final String I18N_PREFIX = "FR-";
 
     private static PluginWebBridge helper;
 
@@ -571,13 +570,6 @@ public class PluginWebBridge {
         //todo  初始化设计器其他部分
     }
 
-    /**
-     * 国际化
-     */
-    public String parseI18(final String key) {
-        return com.fr.design.i18n.Toolkit.i18nText(I18N_PREFIX + key);
-    }
-
     /**
      * 是否是在设计器中操作
      */
diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
index 1d3f1ac2b7..3e2cafdfea 100644
--- a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
+++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java
@@ -1,6 +1,7 @@
 package com.fr.design.extra;
 
 import com.fr.base.TemplateUtils;
+import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StableUtils;
@@ -30,6 +31,7 @@ import java.util.Map;
  */
 public class PluginWebPane extends JFXPanel {
     private static final String RESOURCE_URL = "resourceURL";
+    private static final String LANGUAGE = "language";
     private WebEngine webEngine;
 
     public PluginWebPane(final String installHome, final String mainJs) {
@@ -75,6 +77,7 @@ public class PluginWebPane extends JFXPanel {
         Map<String, Object> map4Tpl = new HashMap<String, Object>();
 
         map4Tpl.put(RESOURCE_URL, "file:///" + URLEncoder.encode(installHome, "UTF-8"));
+        map4Tpl.put(LANGUAGE, GeneralContext.getLocale().toString());
         while ((line = read.readLine()) != null) {
             if (sb.length() > 0) {
                 sb.append('\n');