CORE-116 继续改国际化规范

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -535,7 +535,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         if (!access) {
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No-Privilege") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
             return false;
         }
         collectInfo();
@@ -585,7 +585,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             if (!access) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No-Privilege") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
                 return false;
             }
             editingFILE = fileChooser.getSelectedFILE();

designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java

@@ -33,7 +33,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane<MapMoreLayerTable
 
 		pane.setLayout(new FlowLayout(FlowLayout.LEFT));
 
-		UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_Data_Set") + ":", SwingConstants.RIGHT);
+		UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Select") + ":", SwingConstants.RIGHT);
 
 		dataFromBox = new DatabaseTableDataPane(label) {
 			protected void userEvent() {

designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java

@@ -50,7 +50,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
 
 		northPane.setLayout(new FlowLayout(FlowLayout.LEFT));
 
-		UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_Data_Set") + ":", SwingConstants.RIGHT);
+		UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Select") + ":", SwingConstants.RIGHT);
 
 		northPane.add(fromTableData = new DatabaseTableDataPane(label) {
 			@Override
@@ -127,7 +127,7 @@ public class MapTableDataSinglePane extends FurtherBasicBeanPane<MapSingleLayerT
 	 * 界面弹出标题
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-TableData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata");
 	}
 
 	private void stopEditing() {

designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java

@@ -121,7 +121,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
             centerPane.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0));
             centerPane.add(textPane, BorderLayout.CENTER);
 
-            UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[] {"BiasD-Input_Slope_Line_text_separated_by_'|'", "Example"}, new String[] {" ",  ": Season|Product"}) );
+            UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Tip", "'|'", "Season|Product"));
             textPane.add(formulaLabel, BorderLayout.NORTH);
             formulaLabel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 0));
 
@@ -136,8 +136,8 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
 
             JPanel choicePane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
 
-            choice1 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("BiasD-From-upper_left_to_lower_right")));
+            choice1 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Upper_Left_To_Lower_Right")));
-            choice2 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("BiasD-From-lower_left_to_upper_right")));
+            choice2 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Lower_Left_To_Upper_Right")));
             choice1.addActionListener(leftUp);
             choice2.addActionListener(leftDown);
 
@@ -154,7 +154,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor {
         
         @Override
         protected String title4PopupWindow() {
-        	return com.fr.design.i18n.Toolkit.i18nText("BiasD-Slope_Line");
+        	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line");
         }
         
         public void populate(BiasTextPainter biasTextPainter) {

designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@@ -19,7 +19,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.report.cell.CellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.CellExpandAttr;
@@ -339,12 +338,10 @@ public class DSColumnAdvancedPane extends BasicPane {
                     + "  " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT);
             JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{
                     serialTextField, new UILabel(
-                    com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__")
-                                    "Format", "BindColumn-Result_Serial_Number_Start_From_1", "Inner_Parameter", "Group_Count"},
-                            new String[]{": 1,2-3,5,8  ", ",", "$__count__"})
             )
             }, FlowLayout.LEFT);
-            serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")");
+            serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")");
             selectCountCardPane.add(undefinedPane, "UNDEFINE");
             selectCountCardPane.add(topFormulaPane, "TOP");
             selectCountCardPane.add(bottomFormulaPane, "BOTTOM");
@@ -410,18 +407,6 @@ public class DSColumnAdvancedPane extends BasicPane {
                 }
             }
         }
-
-        private JFormattedTextField getTextField(JSpinner spinner) {
-            JComponent editor = spinner.getEditor();
-            if (editor instanceof JSpinner.DefaultEditor) {
-                return ((JSpinner.DefaultEditor) editor).getTextField();
-            } else {
-                System.err.println("Unexpected editor type: "
-                        + spinner.getEditor().getClass()
-                        + " isn't a descendant of DefaultEditor");
-                return null;
-            }
-        }
     }
 
     private static class JFormulaField extends JPanel {

designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@@ -12,6 +12,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.server.StyleListAction;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DecodeDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.file.FILE;
@@ -53,7 +54,7 @@ class CptApp extends AbstractWorkBookApp {
         
         WorkBook tpl = new WorkBook();
         // richer:打开报表通知
-        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"LOG-Is_Being_Openned", "LOG-Please_Wait"}, new String[]{"\"" + file.getName() + "\"" + ",", "..."}));
+        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Opening_And_Waiting", file.getName()) + "...");
         TempNameStyle namestyle = TempNameStyle.getInstance();
         namestyle.clear();
         String checkStr = StringUtils.EMPTY;
@@ -61,7 +62,7 @@ class CptApp extends AbstractWorkBookApp {
             checkStr = ResourceIOUtils.inputStream2String(file.asInputStream());
             tpl.readStream(file.asInputStream());
         } catch (Exception exp) {
-            String errorMessage = ComparatorUtils.equals(RemoteDeziConstants.INVALID_USER, checkStr) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No-Privilege")
+            String errorMessage = ComparatorUtils.equals(RemoteDeziConstants.INVALID_USER, checkStr) ? Toolkit.i18nText("Fine-Design_Template_Permission_Denied")
                 : com.fr.design.i18n.Toolkit.i18nText("NS-exception_readError");
             FineLoggerFactory.getLogger().error(errorMessage + file, exp);
         }
@@ -91,13 +92,13 @@ class CptApp extends AbstractWorkBookApp {
         jd.setResizable(false);
         jd.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png"));
         String message = namelist.toString().replaceAll("\\[", "").replaceAll("\\]", "");
-        UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Current_custom_global", "Has_been_gone"}, new String[]{message}));
+        UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Global_Style_Missed", message));
         jl.setHorizontalAlignment(SwingConstants.CENTER);
         jd.add(jl, BorderLayout.CENTER);
         JPanel jp = new JPanel();
         
         // ”是“按钮，点击之后将生成一个全局样式，并写入xml
-        UIButton confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Yes"));
+        UIButton confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Yes"));
         confirmButton.addActionListener(new ActionListener() {
             
             @Override
@@ -115,7 +116,7 @@ class CptApp extends AbstractWorkBookApp {
             }
         });
         
-        UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No"));
+        UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No"));
         noButton.addActionListener(new ActionListener() {
             
             @Override
@@ -127,7 +128,7 @@ class CptApp extends AbstractWorkBookApp {
         
         jp.add(confirmButton);
         jp.add(noButton);
-        jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Custom_styles_lost"));
+        jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Custom_Style_Missed"));
         jd.add(jp, BorderLayout.SOUTH);
         GUICoreUtils.centerWindow(jd);
         jd.setVisible(true);

designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java

@@ -26,7 +26,7 @@ class CptxApp extends AbstractWorkBookApp {
     @Override
     public WorkBook asIOFile(FILE file) {
         
-        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"LOG-Is_Being_Openned", "LOG-Please_Wait"}, new String[]{"\"" + file.getName() + "\"" + ",", "..."}));
+        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Opening_And_Waiting", file.getName()) + "...");
         WorkBookX tpl;
         InputStream inputStream;
         try {

designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

@@ -53,8 +53,7 @@ class FormApp extends AbstractAppProvider {
         // peter:打开新报表.
         Form tpl = new Form();
         // richer:打开报表通知
-        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"LOG-Is_Being_Openned", "LOG-Please_Wait"},
+        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("file.getName()", file.getName()) + "...");
-            new String[]{"\"" + file.getName() + "\"" + ",", "..."}));
         try {
             tpl.readStream(file.asInputStream());
         } catch (Exception exp) {

designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java

@@ -18,8 +18,8 @@ import java.awt.*;
 public class ValueVerifierEditPane extends JPanel {
 	private UITableEditorPane<Object[]> tableEditorPane;
 	private final String[] columnNames = new String[] {
-			com.fr.design.i18n.Toolkit.i18nTextArray(new String[] {"Verify-Verify_Formula", "Verify-ToolTips"}, new String[] {"(", ")"}),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify"),
-			com.fr.design.i18n.Toolkit.i18nText("Verify-Error_Information") };
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify_Warn_Text") };
 
 	public ValueVerifierEditPane() {
 		// ben:UITableEditorPane；

designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java

@@ -4,10 +4,8 @@ import com.fr.base.BaseUtils;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.core.WidgetOptionFactory;
 import com.fr.form.ui.CustomToolBarButton;
-import com.fr.form.ui.Widget;
 
 import com.fr.report.web.button.AppletPrint;
-import com.fr.report.web.button.Edit;
 import com.fr.report.web.button.Email;
 import com.fr.report.web.button.ExcelO;
 import com.fr.report.web.button.ExcelP;
@@ -16,13 +14,11 @@ import com.fr.report.web.button.Export;
 import com.fr.report.web.button.FlashPrint;
 import com.fr.report.web.button.NewPrint;
 import com.fr.report.web.button.PDF;
-import com.fr.report.web.button.PDF2;
 import com.fr.report.web.button.PDFPrint;
 import com.fr.report.web.button.PageSetup;
 import com.fr.report.web.button.Print;
 import com.fr.report.web.button.PrintPreview;
 import com.fr.report.web.button.Scale;
-import com.fr.report.web.button.ServerPrint;
 import com.fr.report.web.button.Word;
 import com.fr.report.web.button.page.First;
 import com.fr.report.web.button.page.Last;
@@ -45,8 +41,6 @@ import com.fr.report.web.button.write.Submit;
 import com.fr.report.web.button.write.SubmitForcibly;
 import com.fr.report.web.button.write.Verify;
 import com.fr.report.web.button.write.WriteOfflineHTML;
-import com.fr.stable.bridge.BridgeMark;
-import com.fr.stable.bridge.StableFactory;
 
 public class ReportWebWidgetConstants {
     private ReportWebWidgetConstants() {
@@ -61,25 +55,12 @@ public class ReportWebWidgetConstants {
         return new WidgetOption[]{PAGESETUP, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, SETPRINTEROFFSET, PRINTPREVIEW, CUSTOM_BUTTON};
     }
 
-    public static WidgetOption[] getPreviewToolBarInstance() {
-        return new WidgetOption[]{FIRST, PREVIOUS, PAGENAVI, NEXT, LAST, SCALE, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT,
-                SETPRINTEROFFSET, CUSTOM_BUTTON};
-    }
-
     public static WidgetOption[] getWriteToolBarInstance() {
         return new WidgetOption[]{SUBMIT, VERIFY, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, IMPORTEXCELDATA, SHOWCELLVALUE,
                 APPENDCOLUMNROW, DELETECOLUMNROW, SETPRINTEROFFSET, WRITEOFFLINEHTML, CUSTOM_BUTTON, WRITESTASH, WRITESTASHCLEAR, IMPORTEXCELDATA_CUSTOMIZED,
                 IMPORTEXCEL, IMPORTEXCEL_COVER, IMPORTEXCEL_CLEAN, IMPORTEXCEL_APPEND};
     }
 
-    public static WidgetOption[] getFormToolBarInstance() {
-        return new WidgetOption[]{EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, SETPRINTEROFFSET, CUSTOM_BUTTON};
-    }
-
-    // 查询
-    public static final WidgetOption SEARCH = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Query", "Form-Button"}),
-            BaseUtils.readIcon("/com/fr/web/images/form/resources/preview_16.png"), StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class));
-
     // 提交按钮
     public static final WidgetOption SUBMIT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Submit"), BaseUtils.readIcon("/com/fr/web/images/save.png"),
             Submit.class);
@@ -96,36 +77,29 @@ public class ReportWebWidgetConstants {
     public static final WidgetOption PDF = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-PDF"), BaseUtils.readIcon("/com/fr/web/images/pdf.png"),
             PDF.class);
 
-    // PDF导出，解决linux下无中文字体的导出字体混乱
-    public static final WidgetOption PDF2 = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-PDF", "ReportServerP-PDF2-INFO"}, new String[]{"(", ")"}), BaseUtils.readIcon("/com/fr/web/images/pdf.png"), PDF2.class);
-
     // 客户端PDF打印
     public static final WidgetOption PDFPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Print[Client]"),
             BaseUtils.readIcon("/com/fr/web/images/pdfPrint.png"), PDFPrint.class);
 
-    // 服务器端打印
+
-    public static final WidgetOption SERVERPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Print[Server]"),
-            BaseUtils.readIcon("/com/fr/web/images/serverPrint.png"), ServerPrint.class);
     // 邮件发送
     public static final WidgetOption EMAIL = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Email"), BaseUtils.readIcon("/com/fr/web/images/email.png"), Email.class);
     public static final WidgetOption PRINTPREVIEW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PrintP-Print_Preview"),
             BaseUtils.readIcon("/com/fr/web/images/preview.png"), PrintPreview.class);
 
-    public static final WidgetOption EDIT = WidgetOptionFactory.createByWidgetClass("Edit", Edit.class);
 
     // 导出成Excel 分页导出
-    public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Excel", "FR-Designer_Export_Excel_Page"}, new String[]{"(", ")"}),
+    public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class);
     // 导出成Excel 原样导出
-    public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Excel", "FR-Designer_Export_Excel_Simple"}, new String[]{"(", ")"}),
+    public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class);
     // 导出成Excel 分页分Sheet导出
-    public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Excel", "FR-Designer_Export_Excel_PageToSheet"}, new String[]{"(", ")"}),
+    public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page_To_Sheet"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class);
 
     // 导出成Word
-    public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class);
+    public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class);
     // 页面设置
     public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class);
     // 导出
@@ -133,7 +107,7 @@ public class ReportWebWidgetConstants {
             .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), BaseUtils.readIcon("/com/fr/web/images/export.png"), Export.class);
 
     // 当前页/总页数
-    public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"HJS-Current_Page", "HF-Number_of_Page"}, new String[]{"/", ""}),
+    public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Page_Navi_Text"),
             BaseUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class);
     // 首页
     public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-First"), BaseUtils.readIcon("/com/fr/web/images/first.png"),