REPORT-3216 日文版的一些翻译和显示问题20170708

designer/src/com/fr/design/webattr/WriteWebSettingPane.java

@@ -56,7 +56,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
         //sheet标签页显示位置
         topRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Top"));
         bottomRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Bottom"));
-        sheetShowLocationLabel = new UILabel("sheet" + Inter.getLocText(new String[]{"Label", "Page_Number", "Display position"}) + ":", UILabel.LEFT);
+        sheetShowLocationLabel = new UILabel(Inter.getLocText("FR-Designer_Sheet_Label_Page_Display_Position"), UILabel.LEFT);
         ButtonGroup buttonGroup = new ButtonGroup();
         bottomRadioButton.setSelected(true);
         buttonGroup.add(topRadioButton);

designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java

@@ -49,7 +49,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 		checkBoxDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
 		northPane.add(checkBoxDictPane, BorderLayout.NORTH);
 		JPanel chooseAllPane = new JPanel();
-		checkbox = new UICheckBox(Inter.getLocText(new String[]{"Provide", "Choose_All"}));
+		checkbox = new UICheckBox(Inter.getLocText("FR-Designer_Provide_Choose_All"));
 		chooseAllPane.add(checkbox);
 		chooseAllPane.setLayout(new FlowLayout(FlowLayout.LEFT, 8, 0));
 		northPane.add(chooseAllPane, BorderLayout.CENTER);

designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java

@@ -166,7 +166,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals"));
         this.decimalLength = new com.fr.design.editor.editor.IntegerEditor();
         this.decimalLength.setColumns(4);
-        limitNumberPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Double", "Numbers"}) + ":"), this.decimalLength},
+        limitNumberPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText("FR-Designer_Decimal_Places")), this.decimalLength},
                 FlowLayout.LEFT, 4);
         getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{this.allowDecimalsCheckBox, limitNumberPane}, FlowLayout.LEFT, 4));
         this.allowDecimalsCheckBox.addActionListener(actionListener1);

designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java

@@ -237,7 +237,8 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver {
             public Dimension getPreferredSize() {
                 Dimension dimension = new Dimension();
                 dimension.height = super.getPreferredSize().height;
-                dimension.width = addButton.getWidth() - 2;
+                // 不能写死，否则出现国际化显示不全的问题
+                dimension.width = Math.max(addButton.getWidth() - 2, super.getPreferredSize().width);
                 return dimension;
             }
         };

designer_base/src/com/fr/design/locale/designer.properties

@@ -2005,3 +2005,6 @@ FR-Product_Demo=Demo
 FR-Designer_Tree_Data_Field=Tree Data Field
 FR-Designer_Data_Filter=Data Filter
 Default=Default
+FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
+FR-Designer_Provide_Choose_All=Provide Select All
+FR-Designer_Decimal_Places=Decimal Places:

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2006,3 +2006,6 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the pa
 FR-Product_Demo=Demo
 FR-Designer_Data_Filter=Data Filter
 Default=Default
+FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
+FR-Designer_Provide_Choose_All=Provide Select All
+FR-Designer_Decimal_Places=Decimal Places:

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -2005,3 +2005,6 @@ FR-Product_Demo=\u88FD\u54C1\u30C7\u30E2
 FR-Designer_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF
 FR-Designer_Can_not_use_FormatBursh=\u9023\u7D9A\u3057\u306A\u3044\u8907\u6570\u9818\u57DF\u3067\u306F\u66F8\u5F0F\u30B3\u30D4\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 Default=\u65E2\u5B9A
+FR-Designer_Sheet_Label_Page_Display_Position=
+FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u3059\u3079\u3066\u9078\u629E
+FR-Designer_Decimal_Places=\u5C0F\u6570\u6570\u91CF:

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2005,3 +2005,6 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774
 FR-Product_Demo=\uC81C\uD488\uC2DC\uC5F0
 FR-Designer_Data_Filter=\uB370\uC774\uD130\uC120\uBCC4
 Default=\uAE30\uBCF8
+FR-Designer_Sheet_Label_Page_Display_Position=
+FR-Designer_Provide_Choose_All=\uC81C\uACF5\uBAA8\uB450\uC120\uD0DD
+FR-Designer_Decimal_Places=\uC18C\uC218\uC218\uB7C9:

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2005,3 +2005,6 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570
 FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A
 FR-Designer_Data_Filter=\u6570\u636E\u7B5B\u9009
 Default=\u9ED8\u8BA4
+FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6807\u7B7E\u9875\u663E\u793A\u4F4D\u7F6E\uFF1A
+FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9009
+FR-Designer_Decimal_Places=\u5C0F\u6570\u6570\u76EE\uFF1A

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2006,3 +2006,6 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7
 FR-Product_Demo=\u529F\u80FD\u5C55\u793A
 FR-Designer_Data_Filter=\u8CC7\u6599\u7BE9\u9078
 Default=\u9810\u8A2D
+FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6A19\u7C64\u9801\u986F\u793A\u4F4D\u7F6E\uFF1A
+FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9078
+FR-Designer_Decimal_Places=\u5C0F\u6578\u6578\u76EE\uFF1A

designer_base/src/com/fr/design/mainframe/loghandler/LogDetailPane.java

@@ -7,6 +7,7 @@ import javax.swing.JPanel;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.Inter;
 
 public class LogDetailPane extends JPanel{
 	public LogDetailPane() {
@@ -20,7 +21,7 @@ public class LogDetailPane extends JPanel{
 		fr.setSize(600, 400);
 		GUICoreUtils.centerWindow(fr);
 		fr.setResizable(false);
-		fr.setTitle("日志");
+		fr.setTitle(Inter.getLocText("FR-Designer_Log"));
 		fr.setIconImage(BaseUtils.readImageWithCache("com/fr/design/images/buttonicon/history.png"));
 		fr.getContentPane().setLayout(new BorderLayout());
 		fr.getContentPane().add(this, BorderLayout.CENTER);

designer_base/src/com/fr/start/BaseDesigner.java

@@ -61,11 +61,12 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         }
         BuildContext.setBuildFilePath(buildPropertiesPath());
 
+        //下面这两句的位置不能随便调换，因为会影响语言切换的问题
+        initLanguage();
+
         // 先加载设计器的国际化文件
         Inter.loadLocaleFile(GeneralContext.getLocale(), DesignModule.LOCALE_FILE_PATH);
 
-        //下面这两句的位置不能随便调换，因为会影响语言切换的问题
-        initLanguage();
 
         SplashWindow splashWindow = new SplashWindow(createSplashPane());
         if (args != null) {

designer_form/src/com/fr/design/designer/creator/XCheckBoxGroup.java

@@ -50,7 +50,7 @@ public class XCheckBoxGroup extends XFieldEditor {
 				new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(Inter.getLocText("Adaptive"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class),
 				new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName(
-						Inter.getLocText(new String[]{"Provide", "Choose_All"})).putKeyValue(
+						Inter.getLocText("FR-Designer_Provide_Choose_All")).putKeyValue(
 						XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName(
 						Inter.getLocText("Return-String")).setEditorClass(InChangeBooleanEditor.class)