Merge remote-tracking branch 'origin/dev'

Author: dcloud-wandl

en/Tutorial/PluginsInstall.md

@@ -6,15 +6,15 @@ After HBuilderX is started, click the menu [Tools] [Plugin Installation] to open
 
 In addition to the plug-in shown in the figure below, other plug-ins，go to[market](https://ext.dcloud.net.cn/?cat1=1&cat2=11&orderBy=TotalDownload) download.
 
-<img src="/static/snapshots/tutorial/plugins_install_1.jpg" style="zoom: 45%;border: 1px solid #eee;border-radius: 20px;"/>
+<img src="/static/snapshots/tutorial/plugins_install_en_1.png" style="zoom: 45%;border: 1px solid #eee;border-radius: 20px;"/>
 
 ### Installed plugin
 
 The installed plug-ins of HBuilderX will be displayed in [Installed plug-ins].
 
 When the server has a high version plug-in, the corresponding plug-in will display the word `upgrade`.
 
-<img src="/static/snapshots/tutorial/plugins_install_2.jpg" style="zoom: 45%;border: 1px solid #eee;border-radius: 20px;"/>
+<img src="/static/snapshots/tutorial/plugins_install_en_2.png" style="zoom: 45%;border: 1px solid #eee;border-radius: 20px;"/>
 
 ### Plug-in market installation
 

en/Tutorial/SourceControl/Git/MacOSX.md

@@ -6,7 +6,7 @@ In HBuilderX, to use Git, you need to install the Git plug-in first.
 
 HBuilderX Top menu, 【Tool】-> 【plug-in installation】. Open the plug-in installation window, Find Git, Click【Install】.
 
-<img src="/static/snapshots/tutorial/source_control/plugin_macosx_en.jpg" style="zoom: 45%;border: 1px solid #eee;border-radius: 20px;"/>
+<img src="/static/snapshots/tutorial/source_control/plugin_macosx_en.png" style="zoom: 45%;border: 1px solid #eee;border-radius: 20px;"/>
 
 ## clone and import
 

en/Tutorial/SourceControl/SVN/MacOSX.md

@@ -21,7 +21,7 @@ which svn
 
 HBuilderX Top menu, 【Tool】-> 【plug-in installation】. Open the plug-in installation window, Find SVN, Click【Install】.
 
-<img src="/static/snapshots/tutorial/source_control/plugin_macosx_en.jpg" style="zoom:40%; border-radius: 20px;border: 1px solid #eee;" />
+<img src="/static/snapshots/tutorial/source_control/plugin_macosx_en.png" style="zoom:40%; border-radius: 20px;border: 1px solid #eee;" />
 
 ## Operation menu
 

en/Tutorial/extension/prettier.md

@@ -10,6 +10,7 @@ This plugin needs to be downloaded from [HBuilderX Plugin Market](https://ext.dc
 
 Click the menu [Tools] -> [Settings] -> [Plugin Configuration] -> prettier -> prettier.config.js to open the configuration file.
 
+<img src="/static/snapshots/plugins/plugin_prettier.png" style="zoom: 45%; border: 1px solid #eee;border-radius: 20px;"/>
 
 ## Format options
 

en/Tutorial/extension/validate-html.md

@@ -9,6 +9,8 @@ The html syntax verification plug-in needs to be installed in [HBuilderX Plugin
 
 After the installation is complete, enter [Settings] [Plugin Configuration] [htmlhintrc], and click `htmlhintrc` to configure related rules.
 
+<img src="/static/snapshots/plugins/plugin_setting_en.png" style="zoom: 45%; border: 1px solid #eee;border-radius: 20px;"/>
+
 The option configuration file is `.htmlhintrc`, and the corresponding descriptions of the existing options are as follows:
 
 | Option | Description |

en/Tutorial/extension/validate-stylelint.md

@@ -10,7 +10,7 @@ This plugin needs to be installed at [HBuilderX Plugin Market](https://ext.dclou
 
 Menu [Settings] -> [Plugin Configuration] -> [stylelint], click on `.stylelintrc.js` to open the configuration file.
 
-<img src="/static/snapshots/tutorial/stylelint.png" />
+<img src="/static/snapshots/plugins/plugin_setting_en.png" style="zoom: 45%; border: 1px solid #eee;border-radius: 20px;"/>
 
 ## Rule configuration
 

en/Tutorial/keybindings.md

@@ -4,7 +4,7 @@ HBuilderX, allows you to perform most tasks directly from the keyboard.
 
 HBuilderX has preset 5 shortcut key schemes, namely: `HBuilderX`、`VS Code`、`Sublime Text`、`IntelliJ Idea / Webstorm`、`Eclipse`
 
-<img src="/static/snapshots/tutorial/keyboard.png" />
+<img src="/static/snapshots/tutorial/keyboard_en.png" style="border: 1px solid #eee;"/>
 
 ## Custom shortcuts
 

en/Tutorial/startup.md

@@ -6,4 +6,4 @@ After clicking the [Start Experience] button, you will see a "Readme", which bri
 
 To experience HBuilderX, start with a new project.
 
-<img src="/static/snapshots/tutorial/startup.gif" style="zoom: 80%; border:1px solid #eee;" />
+<img src="/static/snapshots/tutorial/startup_en.gif" style="zoom: 80%; border:1px solid #eee;" />

index.html

@@ -24,9 +24,9 @@
             try{
                 if (lan.substr(0, 2) == 'zh') {
                     lan = "zh-cn";
-                    if (!["zh", "zh_cn", "zh-cn", "zh-hans"].includes(lan)) {
-                        lan = "zh-hant";
-                    };
+                    // if (!["zh", "zh_cn", "zh-cn", "zh-hans"].includes(lan)) {
+                    //     lan = "zh-hant";
+                    // };
                 } else {
                     lan = "en";
                 };
@@ -43,7 +43,14 @@
             if (!["en","zh-cn", "zh-hant"].includes(lan)) {
                 lan = 'zh-cn';
             };
-            var Search = lan.includes('zh') ? "搜索" : "Search";
+            // 设置title
+            if (lan.substr(0, 2) != 'zh') {
+                document.getElementsByTagName("title")[0].innerText = 'HBuilderX Doc';
+            };
+
+            // var Search = lan.includes('zh') ? "搜索" : "Search";
+            var Search = "Search";
+            
             var basePath = `/${lan}/`;
             var loadSidebar = true;
             var loadNavbar = true;

static/search.js

@@ -312,7 +312,7 @@
 
 		var html =
 			"<div class=\"input-wrap\">\n      <input type=\"search\" value=\"" + defaultValue +
-			"\" placeholder=\"搜索\">\n      <div class=\"clear-button\">\n        <svg width=\"26\" height=\"24\">\n          <circle cx=\"12\" cy=\"12\" r=\"11\" fill=\"#ccc\" />\n          <path stroke=\"white\" stroke-width=\"2\" d=\"M8.25,8.25,15.75,15.75\" />\n          <path stroke=\"white\" stroke-width=\"2\"d=\"M8.25,15.75,15.75,8.25\" />\n        </svg>\n      </div>\n    </div>\n    <div class=\"results-panel\"></div>\n    </div>";
+			"\" placeholder=\"Search\">\n      <div class=\"clear-button\">\n        <svg width=\"26\" height=\"24\">\n          <circle cx=\"12\" cy=\"12\" r=\"11\" fill=\"#ccc\" />\n          <path stroke=\"white\" stroke-width=\"2\" d=\"M8.25,8.25,15.75,15.75\" />\n          <path stroke=\"white\" stroke-width=\"2\"d=\"M8.25,15.75,15.75,8.25\" />\n        </svg>\n      </div>\n    </div>\n    <div class=\"results-panel\"></div>\n    </div>";
 		var searchElem = Docsify.dom.create('div', html);
 		var aside = Docsify.dom.find('aside');
 		var navbar = Docsify.dom.find('.app-nav');