From 15e063aa96f9247c0be2832076d74e133eb724f4 Mon Sep 17 00:00:00 2001
From: juhaoyu <2335173323@qq.com>
Date: Wed, 7 Dec 2016 11:39:08 +0800
Subject: [PATCH] PDM

---
 .../actions/file/export/AbstractExportAction.java      | 10 +++++-----
 .../fr/design/actions/file/export/PDFExportAction.java |  2 +-
 .../actions/EmbeddedFormExportExportAction.java        | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java b/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java
index a5f8fdc0fe..e80e75fb9b 100644
--- a/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java
+++ b/designer/src/com/fr/design/actions/file/export/AbstractExportAction.java
@@ -93,10 +93,10 @@ public abstract class AbstractExportAction extends JWorkBookAction {
                 FRLogger.getLogger().error("Error In Make New File");
             }
             fileChooserPane = null;
-            FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("Prepare_Export") + "!");
+            FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("FR-Designer_Prepare_Export") + "!");
 
             (progressbar = new FRProgressBar(createExportWork(file, tpl, parameterMap), designerFrame,
-                    Inter.getLocText("Exporting"), "", 0, 100)).start();
+                    Inter.getLocText("FR-Designer_Exporting"), "", 0, 100)).start();
         }
     }
 
@@ -116,13 +116,13 @@ public abstract class AbstractExportAction extends JWorkBookAction {
                     fileOutputStream.close();
                     this.setProgress(100);
 
-                    FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("Finish_Export") + "!");
+                    FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("FR-Designer_Finish_Export") + "!");
                     JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-                            Inter.getLocText("Exported_successfully") + "\n" + filePath);
+                            Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + filePath);
                 } catch (Exception exp) {
                     this.setProgress(100);
                     FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Export_failed") + "\n" + filePath);
+                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Export_failed") + "\n" + filePath);
                 }
                 return null;
             }
diff --git a/designer/src/com/fr/design/actions/file/export/PDFExportAction.java b/designer/src/com/fr/design/actions/file/export/PDFExportAction.java
index 6016699e64..15082031b8 100644
--- a/designer/src/com/fr/design/actions/file/export/PDFExportAction.java
+++ b/designer/src/com/fr/design/actions/file/export/PDFExportAction.java
@@ -34,7 +34,7 @@ public class PDFExportAction extends AbstractExportAction {
 
     @Override
 	protected ChooseFileFilter getChooseFileFilter() {
-        return new ChooseFileFilter(new String[]{"pdf"}, Inter.getLocText("Export-PDF"));
+        return new ChooseFileFilter(new String[]{"pdf"}, Inter.getLocText("FR-Designer_Export-PDF"));
     }
 
     @Override
diff --git a/designer_form/src/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java b/designer_form/src/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java
index 4d4a3b7e40..20c44f65dd 100644
--- a/designer_form/src/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java
+++ b/designer_form/src/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java
@@ -87,10 +87,10 @@ public class EmbeddedFormExportExportAction extends JTemplateAction<JForm>{
             FRLogger.getLogger().error("Error In Make New File");
         }
         fileChooserPane = null;
-        FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("Prepare_Export") + "!");
+        FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("FR-Designer_Prepare_Export") + "!");
 
         (progressbar = new FRProgressBar(createExportWork(file, tpl, parameterMap), designerFrame,
-                Inter.getLocText("Exporting"), "", 0, 100)).start();
+                Inter.getLocText("FR-Designer_Exporting"), "", 0, 100)).start();
 	}
 	
 	private boolean isOk(int saveValue){
@@ -136,13 +136,13 @@ public class EmbeddedFormExportExportAction extends JTemplateAction<JForm>{
                     fileOutputStream.close();
                     this.setProgress(100);
 
-                    FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("Finish_Export") + "!");
+                    FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("FR-Designer_Finish_Export") + "!");
                     JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-                            Inter.getLocText("Exported_successfully") + "\n" + filePath);
+                            Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + filePath);
                 } catch (Exception exp) {
                     this.setProgress(100);
                     FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
-                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Export_failed") + "\n" + filePath);
+                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Export_failed") + "\n" + filePath);
                 }
                 return null;
             }