From f2a4d487491aecd6abf64e7296e3caa4f4943810 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 10 Feb 2017 13:53:15 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1178=20=E8=8B=B1=E6=96=87=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E2=80=94=E2=80=9423/23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/actions/help/TutorialAction.java    | 15 ++++++++++++---
 .../design/mainframe/toolbar/ToolBarMenuDock.java |  3 ++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/designer_base/src/com/fr/design/actions/help/TutorialAction.java b/designer_base/src/com/fr/design/actions/help/TutorialAction.java
index b238359455..c62ad00262 100644
--- a/designer_base/src/com/fr/design/actions/help/TutorialAction.java
+++ b/designer_base/src/com/fr/design/actions/help/TutorialAction.java
@@ -60,17 +60,26 @@ public class TutorialAction extends UpdateAction {
      */
     public void actionPerformed(ActionEvent evt) {
         Locale locale = FRContext.getLocale();
-        if (ComparatorUtils.equals(locale, Locale.CHINA) || ComparatorUtils.equals(locale, Locale.TAIWAN)){
-            HttpClient client = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("help"));
+        String helpKey = "";
+
+        if (ComparatorUtils.equals(locale, Locale.CHINA) || ComparatorUtils.equals(locale, Locale.TAIWAN)) {
+            helpKey = "help";
+        } else if (ComparatorUtils.equals(locale, Locale.US)) {
+            helpKey = "help.en";
+        }
+
+        if (!helpKey.isEmpty()) {
+            HttpClient client = new HttpClient(SiteCenter.getInstance().acquireUrlByKind(helpKey));
             if(client.getResponseCode() != -1) {
                 try {
-                	 Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("help")));
+                	 Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind(helpKey)));
                     return;
                 } catch (Exception e) {
                     //出了异常的话, 依然打开本地教程
                 }
             }
         }
+
         if (OperatingSystem.isMacOS()) {
             nativeExcuteMacInstallHomePrograms("helptutorial.app");
         }
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 8c60068702..7fcea5d1ec 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -312,9 +312,10 @@ public abstract class ToolBarMenuDock {
     public ShortCut[] createHelpShortCuts() {
         java.util.List<ShortCut> shortCuts = new ArrayList<ShortCut>();
         shortCuts.add(new WebDemoAction());
-        // 英文，把 video 的链接放到 Help 下面
+        // 英文，把 video 和帮助文档放到 Help 下面
         if (FRContext.getLocale().equals(Locale.US)) {
             shortCuts.add(new VideoAction());
+            shortCuts.add(new TutorialAction());
         }
         shortCuts.add(SeparatorDef.DEFAULT);
         //shortCuts.add(new TutorialAction());