Skip to content

Commit

Permalink
fix #24
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Dec 28, 2019
1 parent 31e1824 commit 83f1f0a
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 67 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@

* [3](https://github.com/Vanessa219/vditor/issues/3) 编辑预览同步滚动改进 `enhancement`
* [4](https://github.com/Vanessa219/vditor/issues/4) 添加支持思维导图的功能 `enhancement`
* [25](https://github.com/Vanessa219/vditor/issues/25) wysiwyg 表格添加居中居左居右 `enhancement`

### v2.0.2 / 2019-12-28
### v2.0.3 / 2019-12-28

* [24](https://github.com/Vanessa219/vditor/issues/24) wysiwyg 块工具栏添加文字说明 `enhancement`
* [23](https://github.com/Vanessa219/vditor/issues/23) When code copied and pasted.... `bug`
* [2](https://github.com/Vanessa219/vditor/issues/2) 所见即所得 `enhancement`
* 文档更新
Expand Down
3 changes: 3 additions & 0 deletions src/assets/icons/align-center.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions src/assets/icons/format.svg

This file was deleted.

22 changes: 22 additions & 0 deletions src/ts/i18n/index.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
export const i18n: II18n = {
en_US: {
"alternateText": "Alternate text",
"bold": "Blod",
"both": "editor & preview",
"check": "Task List",
"code": "Code Block",
"column": "Column",
"copied": "Copied",
"copy": "Copy",
"devtools": "DevTools",
"edit": "Edit",
"emoji": "Emoji",
"fileTypeError": "file type is error",
"format": "Format",
"fullscreen": "Fullscreen",
"headings": "Headings",
"help": "Help",
"imageURL": "image URL",
"indent": "Indent",
"info": "Info",
"inline-code": "Inline Code",
"insertAfter": "Insert line after",
"insertBefore": "Insert line Before",
"italic": "Italic",
"language": "Language",
"line": "Line",
"link": "Link",
"list": "List",
Expand All @@ -30,33 +37,44 @@ export const i18n: II18n = {
"record-tip": "The device does not support recording",
"recording": "recording...",
"redo": "Redo",
"remove": "Remove",
"row": "Row",
"strike": "Strike",
"table": "Table",
"tooltipText": "Tooltip text",
"undo": "Undo",
"unindent": "Unindent",
"update": "Update",
"upload": "Upload image or file",
"uploadError": "upload error",
"uploading": "uploading...",
"wysiwyg": "WYSIWYG",
},
zh_CN: {
"alternateText": "替代文本",
"bold": "粗体",
"both": "编辑 & 预览",
"check": "任务列表",
"code": "代码块",
"column": "列",
"copied": "已复制",
"copy": "复制",
"devtools": "开发者工具",
"edit": "编辑",
"emoji": "表情",
"fileTypeError": "文件类型不允许上传",
"format": "格式化",
"fullscreen": "全屏",
"headings": "标题",
"help": "帮助",
"imageURL": "图片地址",
"indent": "增加缩进",
"info": "关于",
"inline-code": "行内代码",
"insertAfter": "末尾插入行",
"insertBefore": "起始插入行",
"italic": "斜体",
"language": "语言",
"line": "分隔线",
"link": "链接",
"list": "无序列表",
Expand All @@ -70,9 +88,13 @@ export const i18n: II18n = {
"record-tip": "该设备不支持录音功能",
"recording": "录音中...",
"redo": "重做",
"remove": "删除",
"row": "行",
"strike": "删除线",
"table": "表格",
"tooltipText": "提示文本",
"undo": "撤销",
"unindent": "减少缩进",
"update": "更新",
"upload": "上传图片或文件",
"uploadError": "上传错误",
Expand Down
2 changes: 1 addition & 1 deletion src/ts/toolbar/Format.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import formatSVG from "../../assets/icons/format.svg";
import formatSVG from "../../assets/icons/outdent.svg";
import {formatRender} from "../editor/formatRender";
import {getSelectPosition} from "../editor/getSelectPosition";
import {getEventName} from "../util/getEventName";
Expand Down
Loading

0 comments on commit 83f1f0a

Please sign in to comment.