Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Leecason committed Mar 23, 2020
2 parents 21b98c9 + e325bd1 commit bbed8d5
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 194 deletions.
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -439,15 +439,18 @@ properties: [https://github.com/scrumpy/tiptap#editormenububble](https://github.

Footer of the editor, after the editor content.

## 🏗 Contribution
## 🏗 Contributing ![PR or ISSUE](https://img.shields.io/badge/PR%20or%20ISSUE-welcome-brightgreen)

1. fork this project
2. edit code (semantic commit is better)
3. PR to `develop` branch
1. 🍴Fork it
2. 🔀Create your branch: `git checkout -b your-branch`
3. 🎨Make your changes
4. 📝Commit your changes with [Semantic Commit Messages (recommended)](https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716)
5. 🚀Push to the branch: `git push origin your-branch`
6. 🎉Submit a PR to `develop` branch

_OR_

1. Just create an issue!
Just submit an [issue](https://github.com/Leecason/element-tiptap/issues)! - any helpful suggestions are welcomed. 😜

## 📝 Changelog
[Changelog](https://github.com/Leecason/element-tiptap/blob/master/CHANGELOG.md)
Expand Down
13 changes: 8 additions & 5 deletions README_ZH.md
Original file line number Diff line number Diff line change
Expand Up @@ -434,15 +434,18 @@ export default {

编辑器的底部,在编辑器内容的后面

## 🏗 贡献
## 🏗 贡献 ![PR or ISSUE](https://img.shields.io/badge/PR%20or%20ISSUE-welcome-brightgreen)

1. fork 此项目
2. 编辑你的代码
3. PR to `develop` 分支
1. 🍴Fork 此项目
2. 🔀创建你的分支: `git checkout -b your-branch`
3. 🎨编辑你的代码
4. 📝Commit 你的代码,推荐 [Semantic Commit Messages (recommended)](https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716)
5. 🚀Push 到你的分支: `git push origin your-branch`
6. 🎉提交 PR 到 `develop` 分支

_OR_

1. 留下你的 issue
留下你的 [issue](https://github.com/Leecason/element-tiptap/issues) - 欢迎任何有用的建议. 😜

## 📝 更新日志
[更新日志](https://github.com/Leecason/element-tiptap/blob/master/CHANGELOG.md)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.1.2",
"lint-staged": "^9.4.3",
"lint-staged": "^10.0.8",
"node-sass": "^4.12.0",
"postcss-preset-env": "^6.7.0",
"rollup": "^1.27.13",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/ru/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default {
add_column_after: 'Добавить столбец справа',
delete_column: 'Удалить столбец',
add_row_before: 'Добавить строку сверху',
add_row_after: 'Добавить строки снизу',
add_row_after: 'Добавить строку снизу',
delete_row: 'Удалить строку',
merge_cells: 'Объединить ячейки',
split_cell: 'Разделить ячейки',
Expand Down Expand Up @@ -171,6 +171,6 @@ export default {
tooltip: 'Выделить все',
},
},
characters: 'Символ',
characters: 'Количество символов',
},
};
Loading

0 comments on commit bbed8d5

Please sign in to comment.