Merge branch 'apache:master' into patch-20210711

apache · Jul 14, 2021 · d4182cf · d4182cf
2 parents 0d96f35 + 1e55aa3
commit d4182cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/web/src/components/Plugin/PluginPage.tsx b/web/src/components/Plugin/PluginPage.tsx
@@ -225,7 +225,7 @@ const PluginPage: React.FC<Props> = ({
           );
         })}
         <br />
-        {formatMessage({ id: 'component.plugin.tip1' })}
+        {formatMessage({ id: 'component.plugin.tip1' })}&nbsp;
         <a
           href="https://apisix.apache.org/docs/dashboard/FAQ#4-after-modifying-the-plugin-schema-or-creating-a-custom-plugin-in-apache-apisix-why-cant-i-find-it-on-the-dashboard"
           target="_blank"

diff --git a/web/src/components/Plugin/locales/en-US.ts b/web/src/components/Plugin/locales/en-US.ts
@@ -17,10 +17,10 @@
 export default {
   'component.plugin.tip1': 'NOTE: After customizing the plugin, you need to update schema.json.',
   'component.plugin.tip2': 'How to update?',
-  'component.select.pluginTemplate': 'Select a  plugin template',
+  'component.select.pluginTemplate': 'Select a plugin template',
   'component.step.select.pluginTemplate.select.option': 'Custom',
   'component.plugin.pluginTemplate.tip1': '1. When a route already have plugins field configured, the plugins in the plugin template will be merged into it.',
-  'component.plugin.pluginTemplate.tip2': '2. The same plugin in the plugin template will override one in the plugins',
+  'component.plugin.pluginTemplate.tip2': '2. The same plugin in the plugin template will override one in the plugins.',
   'component.plugin.enable': 'Enable',
   'component.plugin.disable': 'Disable',
   'component.plugin.authentication': 'Authentication',