diff --git a/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
index 1c11aad2e4..c9128627cc 100644
--- a/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
@@ -61,11 +61,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         regPane.getRegComboBox().addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 RegExp regExp = (RegExp) regPane.getRegComboBox().getSelectedItem();
-                if (!StringUtils.isNotEmpty(regExp.toRegText())) {
-                    getRegErrorMsgTextField().setEnabled(false);
-                } else {
-                    getRegErrorMsgTextField().setEnabled(true);
-                }
+				getRegErrorMsgTextField().setEnabled(regExp.errorMessageEditable());
 
             }
         });
diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index 8df23d70d9..2a3fa28d35 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -138,8 +138,31 @@ public abstract class ToolBarMenuDock {
         // 添加帮助菜单
         menuList.add(createHelpMenuDef());
 
+        // 添加社区菜单
+        addCommunityMenuDef(menuList);
+		
         return menuList.toArray(new MenuDef[menuList.size()]);
     }
+	
+	public  void addCommunityMenuDef(java.util.List<MenuDef> menuList){
+        Locale locale = FRContext.getLocale();
+        Locale [] locales =supportCommunityLocales();
+        for(int i = 0; i < locales.length; i++) {
+            if(locale.equals(locales[i])){
+                menuList.add(createCommunityMenuDef());
+                break;
+            }
+        }
+    }
+	
+	public Locale[] supportCommunityLocales() {
+        return new Locale[]{
+                Locale.CHINA,
+                Locale.JAPAN,
+                Locale.TAIWAN,
+                Locale.US,
+        };
+    }
 
     public void insertTemplateExtendMenu(ToolBarMenuDockPlus plus, MenuDef[] menuDefs) {
         // 给菜单加插件入口