Commit 58cf1dc4 authored by baoliang's avatar baoliang
Browse files

Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415

parents a4dd9589 f44177b4

escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
      _verifTimeout () {

        const reg = /^[1-9]\d*$/

        if (!reg.test(this.timeout)) {

          this.$message.warning(`${i18n.$t('Please enter a positive integer')}`)

          this.$message.warning(`${i18n.$t('Please enter a positive integer greater than 0')}`)

          return false

        }

        return true
@@ -125,7 +125,7 @@ 
            return

          }

          // verification timeout

          if (!this._verifTimeout()) {

          if (this.checkedTimeout && !this._verifTimeout()) {

            return

          }

escheduler-ui/src/js/module/i18n/locale/en_US.js

+2 −1
Original line number Diff line number Diff line
@@ -447,5 +447,6 @@ export default { 
  'Threads connections': 'Threads connections',

  'Max used connections': 'Max used connections',

  'Threads running connections': 'Threads running connections',

  'Worker group': 'Worker group'

  'Worker group': 'Worker group',

  'Please enter a positive integer greater than 0': 'Please enter a positive integer greater than 0',

}

escheduler-ui/src/js/module/i18n/locale/zh_CN.js

+2 −1
Original line number Diff line number Diff line
@@ -447,5 +447,6 @@ export default { 
  'Threads connections': '当前活跃连接',

  'Max used connections': '同时使用连接最大数',

  'Threads running connections': '数据库当前活跃连接数',

  'Worker group': 'Worker分组'

  'Worker group': 'Worker分组',

  'Please enter a positive integer greater than 0': '请输入大于 0 的正整数',

}