Merge pull request #679 in BA/design from ~PLOUGH/design:dev to dev

* commit 'e67c89a2ba70ffe7551f4fcb8bdae078228b452e':
  调整代码
  REPORT-1379 英文设计器，日文设计器去掉community
  REPORT-1415 将产品里用finereport后缀的改成fanruan
  REPORT-1415 将产品里用finereport后缀的改成fanruan

designer_base/src/com/fr/design/actions/community/VideoAction.java

@@ -5,6 +5,7 @@ import java.awt.event.ActionEvent;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Locale;
 
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
@@ -32,22 +33,27 @@ public class VideoAction extends UpdateAction
 	@Override
 	public void actionPerformed(ActionEvent arg0)
 	{
-		  String url = SiteCenter.getInstance().acquireUrlByKind("bbs.video");
+		String url;
-	        if (StringUtils.isEmpty(url)) {
+		if (FRContext.getLocale().equals(Locale.US)) {
-	            FRContext.getLogger().info("The URL is empty!");
+			url = SiteCenter.getInstance().acquireUrlByKind("bbs.video.en");
-	            return;
+		} else {
-	        }
+	  		url = SiteCenter.getInstance().acquireUrlByKind("bbs.video");
-	        try {
+		}
-	            Desktop.getDesktop().browse(new URI(url));
+		if (StringUtils.isEmpty(url)) {
-	        } catch (IOException exp) {
+			FRContext.getLogger().info("The URL is empty!");
-	            JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
+			return;
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+		}
-	        } catch (URISyntaxException exp) {
+		try {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+			Desktop.getDesktop().browse(new URI(url));
-	        } catch (Exception exp) {
+		} catch (IOException exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+			JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser"));
-	            FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+			FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
-	        }
+		} catch (URISyntaxException exp) {
+			FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+		} catch (Exception exp) {
+			FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+			FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+		}
 
 	}
 	  public static final MenuKeySet VIDEO = new MenuKeySet() {

designer_base/src/com/fr/design/actions/help/AboutPane.java

@@ -80,8 +80,8 @@ public class AboutPane extends JPanel {
             contentPane.add(boxCenterAlignmentPane);
         }
 
-        BoxCenterAligmentPane actionLabel = getURLActionLabel(ProductConstants.WEBSITE_URL);
+        BoxCenterAligmentPane actionLabel = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("website", ProductConstants.WEBSITE_URL));
-        BoxCenterAligmentPane emailLabel = getEmailActionLabel(ProductConstants.SUPPORT_EMAIL);
+        BoxCenterAligmentPane emailLabel = getEmailActionLabel(SiteCenter.getInstance().acquireUrlByKind("register.email", ProductConstants.SUPPORT_EMAIL));
         
         contentPane.add(actionLabel);
         contentPane.add(emailLabel);

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

@@ -160,9 +160,7 @@ public abstract class ToolBarMenuDock {
 	public Locale[] supportCommunityLocales() {
         return new Locale[]{
                 Locale.CHINA,
-                Locale.JAPAN,
                 Locale.TAIWAN,
-                Locale.US,
         };
     }
 
@@ -314,6 +312,10 @@ public abstract class ToolBarMenuDock {
     public ShortCut[] createHelpShortCuts() {
         java.util.List<ShortCut> shortCuts = new ArrayList<ShortCut>();
         shortCuts.add(new WebDemoAction());
+        // 英文，把 video 的链接放到 Help 下面
+        if (FRContext.getLocale().equals(Locale.US)) {
+            shortCuts.add(new VideoAction());
+        }
         shortCuts.add(SeparatorDef.DEFAULT);
         //shortCuts.add(new TutorialAction());
         shortCuts.add(SeparatorDef.DEFAULT);