zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'i18n' into master

This commit is contained in:
前端码农er 2019-08-28 14:06:07 +08:00 committed by GitHub
parent 0308447178 a9e21c2ce2
commit ee1900984a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.ja.md
View File

@ -137,7 +137,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
```bash ```bash
# clone the project # clone the project
git clone https://github.com/PanJiaChen/vue-element-admin.git git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git
# enter the project directory # enter the project directory
cd vue-element-admin cd vue-element-admin

2
README.md
View File

@ -141,7 +141,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
```bash ```bash
# clone the project # clone the project
git clone https://github.com/PanJiaChen/vue-element-admin.git git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git
# enter the project directory # enter the project directory
cd vue-element-admin cd vue-element-admin

2
README.zh-CN.md
View File

@ -156,7 +156,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
```bash ```bash
# 克隆项目 # 克隆项目
git clone https://github.com/PanJiaChen/vue-element-admin.git git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git
# 进入项目目录 # 进入项目目录
cd vue-element-admin cd vue-element-admin

1
src/components/Tinymce/index.vue
View File

@ -115,6 +115,7 @@ export default {
initTinymce() { initTinymce() {
const _this = this const _this = this
window.tinymce.init({ window.tinymce.init({
language: this.language,
selector: `#${this.tinymceId}`, selector: `#${this.tinymceId}`,
language: this.languageTypeList['en'], language: this.languageTypeList['en'],
height: this.height, height: this.height,