Merge pull request #1197 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '97aa56a31dad39ce6624f0c57487c2ad052217a4':
  REPORT-4438 [9.0一轮回归]国际化文件中缺少key
  REPORT-4425 [9.0一轮回归]英文设计器菜单栏有community标签
  REPORT-4394 [9.0一轮回归]条件属性、超级链接重命名失败

designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@@ -132,6 +132,10 @@ public abstract class UIListControlPane extends UIControlPane {
             protected void doAfterLostFocus() {
                 UIListControlPane.this.updateControlUpdatePane();
             }
+            @Override
+            protected void doAfterStopEditing() {
+                saveSettings();
+            }
         };
         nameEdList.setCellRenderer(new UINameableListCellRenderer(this));
         return nameEdList;

designer_base/src/com/fr/design/gui/ilist/UINameEdList.java

@@ -312,9 +312,14 @@ public class UINameEdList extends UIList implements CellEditorListener {
             String name = StringUtils.isBlank(value.toString()) ? oldName : value.toString();
             setNameAt(name, editingIndex);
             removeComp();
+            doAfterStopEditing();
         }
     }
 
+    protected void doAfterStopEditing() {
+        // default: do nothing
+    }
+
     public String[] getAllNames() {
         int length = this.getModel().getSize();
         String[] names = new String[length];

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

@@ -2013,7 +2013,6 @@ FR-Designer_Parameter=
 FR-Designer-Plugin_Plugin=Plugin
 FR-Designer_Background=Background
 Template=Template
-
 FR-Designer_Parent_Marked_Field=Parent Marked Field
 FR-Designer_Original_Marked_Filed=Original Marked Filed
 FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed
@@ -2135,4 +2134,10 @@ FR-Designer_Widgetname=Widget Name
 FR-Designer_Insert_Cell_Element=Insert Cell Element
 FR-Designer_Add_Condition=Add Condition
 FR-Designer_Use_Params_Template=use parameter template
-FR-Designer_Label_Name=label name
+FR-Designer_Label_Name=label name
+FR-Designer_Widget_Visible=
+FR-Designer_Widget_Enabled=
+FR-Designer_Cell_Visible=
+FR-Designer_Show=
+FR-Designer_Float_Visible=
+FR-Designer_Cell_Value=

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

@@ -1134,7 +1134,6 @@ FRFont-bold=Bold
 FR-Designer_Set_Submit_Condition=Submit Condition
 Form-Change_Widget_Name=Change Control Name
 ReportColumns-Report_Columns=Multi-columns/lines display
-FR-Designer_Can_not_use_FormatBursh=Can't use format painter in multiple selections
 CellElement-Property_Table=Cell Attribute Table
 Dictionary-Dynamic_SQL=Dynamic SQL
 FR-Designer_Form-CheckBoxGroup=CheckBoxGroup
@@ -2015,7 +2014,6 @@ FR-Designer_Parameter=Parameter
 FR-Designer-Plugin_Plugin=Plugin
 FR-Designer_Background=BG
 Template=Template
-
 FR-Designer_Original_Marked_Filed=Original Tag Field
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length
 FR-Designer_Can_not_use_FormatBursh=Can't use format painter in multiple selections
@@ -2131,4 +2129,15 @@ FR-Designer_Widgetname=Widget Name
 FR-Designer_Insert_Cell_Element=Insert Cell Element
 FR-Designer_Add_Condition=Add Condition
 FR-Designer_Use_Params_Template=use parameter template
-FR-Designer_Label_Name=label name
+FR-Designer_Label_Name=label name
+FR-Designer_Widget_Visible=
+FR-Designer_Widget_Display_Report_Tool=
+FR-Designer_Cell_Value=
+FR-Designer_Cell_Visible=
+FR-Designer_Widget_Formula=
+FR-Designer_Show=
+FR-Designer_Widget_Position=
+FR-Designer_Float_Visible=
+FR-Designer_Widget_String=
+FR-Designer_Widget_Field=
+FR-Designer_Widget_Enabled=

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

@@ -1132,7 +1132,6 @@ FRFont-bold=\u592A\u5B57
 FR-Designer_Set_Submit_Condition=\u63D0\u51FA\u6761\u4EF6\u3092\u8A2D\u5B9A
 Form-Change_Widget_Name=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u540D\u5909\u66F4
 ReportColumns-Report_Columns=\u5E33\u7968\u30B3\u30E9\u30E0
-FR-Designer_Can_not_use_FormatBursh=\u8907\u6570\u9078\u629E\u3057\u305F\u30A8\u30EA\u30A2\u3067\u306F\u66F8\u5F0F\u30D6\u30E9\u30B7\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\!
 CellElement-Property_Table=\u30BB\u30EB\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u00B7\u30B7\u30FC\u30C8
 Dictionary-Dynamic_SQL=\u52D5\u614BSQL
 FR-Designer_Form-CheckBoxGroup=\u30D5\u30EC\u30FC\u30E0\u30BB\u30C3\u30C8\u3092\u8907\u6570\u9078\u629E
@@ -2127,4 +2126,18 @@ FR-Designer-Basic_Dynamic_Parameter_Injection=
 FR-Designer_Label=\u30E9\u30D9\u30EBa
 FR-Designer_Widgetname=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u540D
 FR-Designer_Insert_Cell_Element=
-FR-Designer_Add_Condition=
+FR-Designer_Add_Condition=
+FR-Designer_Widget_Visible=
+FR-Designer_Widget_Display_Report_Tool=
+FR-Designer_Cell_Value=
+FR-Designer_Cell_Visible=
+FR-Designer_Widget_Formula=
+M-New_WorkBook=
+FR-Designer_Show=
+FR-Designer-AlphaFine_NO_Result=
+FR-Designer_Widget_Position=
+FR-Designer_Float_Visible=
+FR-Designer_Widget_String=
+FR-Designer_Widget_Field=
+FR-Designer_Add_Event=
+FR-Designer_Widget_Enabled=

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

@@ -2128,4 +2128,16 @@ FR-Designer-Basic_Dynamic_Parameter_Injection=
 FR-Designer_Label=\uB808\uC774\uBE14
 FR-Designer_Widgetname=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC774\uB984
 FR-Designer_Insert_Cell_Element=
-FR-Designer_Add_Condition=
+FR-Designer_Add_Condition=
+FR-Designer_Widget_Visible=
+FR-Designer_Widget_Display_Report_Tool=
+FR-Designer_Cell_Value=
+FR-Designer_Cell_Visible=
+FR-Designer_Widget_Formula=
+FR-Designer_Show=
+FR-Designer-AlphaFine_NO_Result=
+FR-Designer_Widget_Position=
+FR-Designer_Float_Visible=
+FR-Designer_Widget_String=
+FR-Designer_Widget_Field=
+FR-Designer_Widget_Enabled=

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

@@ -2015,7 +2015,6 @@ FR-Designer_Parameter=\u53C2\u6570
 FR-Designer-Plugin_Plugin=\u63D2\u4EF6
 FR-Designer_Background=\u80CC\u666F
 Template=\u6A21\u7248
-
 FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811
 FR-Designer_Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5
@@ -2025,7 +2024,6 @@ FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A
 FR-Designer_Data_Filter=\u6570\u636E\u7B5B\u9009
 Default=\u9ED8\u8BA4
 FR-Base-Load_Resource_File=\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6
-
 FR-Designer_Cell_Element=\u5355\u5143\u683C\u5143\u7D20
 FR-Designer_Cell_Attributes=\u5355\u5143\u683C\u5C5E\u6027
 FR-Designer_Float_Element=\u60AC\u6D6E\u5143\u7D20
@@ -2140,4 +2138,6 @@ FR-Designer_Select_Color=\u9009\u62E9\u989C\u8272
 FR-Designer-Basic_Dynamic_Parameter_Injection=\u6CE8\u5165
 FR-Designer_Label=\u6807\u7B7E
 FR-Designer_Widgetname=\u63A7\u4EF6\u540D
-FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20
+FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20
+FR-Designer-Plugin_Has_Been_Actived=
+FR-Designer-Plugin_Has_Been_Disabled=

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

@@ -1134,7 +1134,6 @@ FRFont-bold=\u7C97\u9AD4
 FR-Designer_Set_Submit_Condition=\u8A2D\u5B9A\u63D0\u4EA4\u689D\u4EF6
 Form-Change_Widget_Name=\u66F4\u6539\u63A7\u5236\u9805\u540D
 ReportColumns-Report_Columns=\u5831\u8868\u5206\u6B04
-FR-Designer_Can_not_use_FormatBursh=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F
 CellElement-Property_Table=\u5132\u5B58\u683C\u5C6C\u6027\u8868
 Dictionary-Dynamic_SQL=\u52D5\u614BSQL
 FR-Designer_Form-CheckBoxGroup=\u5FA9\u9078\u6846\u7D44
@@ -2014,7 +2013,6 @@ FR-Designer_Parameter=\u53C3\u6578
 FR-Designer-Plugin_Plugin=\u63D2\u4EF6
 FR-Designer_Background=\u586B\u6EFF\u8272\u5F69
 Template=\u7BC4\u672C
-
 FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0
 FR-Designer_Can_not_use_FormatBursh=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F
@@ -2025,7 +2023,6 @@ FR-Product_Demo=\u529F\u80FD\u5C55\u793A
 FR-Designer_Data_Filter=\u8CC7\u6599\u7BE9\u9078
 Default=\u9810\u8A2D
 FR-Base-Load_Resource_File=\u52A0\u8F09\u914D\u7F6E\u6A94\u6848
-
 FR-Designer_Cell_Element=\u5132\u5B58\u683C\u5143\u7D20
 FR-Designer_Cell_Attributes=\u5132\u5B58\u683C\u5C6C\u6027
 FR-Designer_Float_Element=\u61F8\u6D6E\u5143\u7D20
@@ -2132,4 +2129,15 @@ FR-Designer-Basic_Dynamic_Parameter_Injection=\u6CE8\u5165
 FR-Designer_Label=\u6A19\u7C3D
 FR-Designer_Widgetname=\u63A7\u5236\u9805\u540D
 FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20
-FR-Designer_Add_Condition=
+FR-Designer_Add_Condition=
+FR-Designer_Widget_Visible=
+FR-Designer_Widget_Display_Report_Tool=
+FR-Designer_Cell_Value=
+FR-Designer_Cell_Visible=
+FR-Designer_Widget_Formula=
+FR-Designer_Show=
+FR-Designer_Widget_Position=
+FR-Designer_Float_Visible=
+FR-Designer_Widget_String=
+FR-Designer_Widget_Field=
+FR-Designer_Widget_Enabled=

designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -150,8 +150,10 @@ public abstract class ToolBarMenuDock {
         // 添加帮助菜单
         menuList.add(createHelpMenuDef());
 
-        // 添加社区菜单
+        if (FRContext.getLocale() == Locale.CHINA || FRContext.getLocale() == Locale.TAIWAN) {
-        addCommunityMenuDef(menuList);
+            // 添加社区菜单
+            addCommunityMenuDef(menuList);
+        }
 
         // 添加全部UpdateAction到actionmanager中
         addAllUpdateActionsToList(menuList);