Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

2021-08-23 09:37:50 +08:00
parent 8862cbef8f 0676301d54
commit dbb0fd2619
5 changed files with 63 additions and 32 deletions
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -612,7 +612,9 @@ const en = {
    confirmCancel: 'Changes you made are not saved?',
    copySuccess: 'Copy success',
    lnglatError: 'Wrong format of latitude and longitude',
-    tagError: 'Does not conform to regular expressions /^[a-zA-Z_][a-zA-Z0-9_]*/!'
+    tagError: 'Does not conform to regular expressions /^[a-zA-Z_][a-zA-Z0-9_]*/!',
+    syntaxError: 'Syntax error',
+    errorInRow: 'There are some syntax errors in rows'
  },
  asset: {
    asset: 'Asset ',