Merge branch 'master' into deploy

This commit is contained in:
Pan
2018-10-15 16:32:33 +08:00
9 changed files with 203 additions and 5 deletions

View File

@@ -9,6 +9,7 @@
<el-radio-group v-model="lang" size="small">
<el-radio label="zh" border>简体中文</el-radio>
<el-radio label="en" border>English</el-radio>
<el-radio label="es" border>Español</el-radio>
</el-radio-group>
<el-tag style="margin-top:15px;display:block;" type="info">{{ $t('i18nView.note') }}</el-tag>
</div>
@@ -101,6 +102,7 @@ export default {
if (!this.$i18n.getLocaleMessage('en')[viewName]) {
this.$i18n.mergeLocaleMessage('en', local.en)
this.$i18n.mergeLocaleMessage('zh', local.zh)
this.$i18n.mergeLocaleMessage('es', local.es)
}
this.setOptions() // set default select options
},

View File

@@ -39,5 +39,25 @@ export default {
two: 'Two',
three: 'Three'
}
},
es: {
i18nView: {
title: 'Switch Language',
note: 'The internationalization of this project is based on vue-i18n',
datePlaceholder: 'Pick a day',
selectPlaceholder: 'Select',
tableDate: 'tableDate',
tableName: 'tableName',
tableAddress: 'tableAddress',
default: 'default:',
primary: 'primary',
success: 'success',
info: 'info',
warning: 'warning',
danger: 'danger',
one: 'One',
two: 'Two',
three: 'Three'
}
}
}

View File

@@ -7,7 +7,7 @@
</template>
<script>
import { validateURL } from '@/utils/validate'
import { isExternal } from '@/utils'
export default {
props: {
@@ -18,7 +18,7 @@ export default {
},
methods: {
isExternalLink(routePath) {
return validateURL(routePath)
return isExternal(routePath)
},
linkProps(url) {
if (this.isExternalLink(url)) {

View File

@@ -37,7 +37,7 @@
<script>
import path from 'path'
import { generateTitle } from '@/utils/i18n'
import { validateURL } from '@/utils/validate'
import { isExternal } from '@/utils'
import Item from './Item'
import AppLink from './Link'
import FixiOSBug from './FixiOSBug'
@@ -98,7 +98,7 @@ export default {
return path.resolve(this.basePath, routePath)
},
isExternalLink(routePath) {
return validateURL(routePath)
return isExternal(routePath)
},
generateTitle
}