[docs][zh-cn] synced recent updates #429
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
No problem.👌 |
fnlctrl
approved these changes
Feb 22, 2018
| @@ -18,6 +18,8 @@ shallow(Component, { | |||
| }) | |||
| ``` | |||
|
|
|||
| > **注意：**在一个 `localVue` 上安装 Vue Router 时也会将 `$route` 和 `$router` 作为两个只读属性添加给该 `localVue`。这意味着如果你使用安装了 Vue Router 的 `localVue`，则不能在挂在一个组件时使用 `mocks` 选项来复写 `$route` 和 `$router`。 | |||
There was a problem hiding this comment.
@fnlctrl 我检查了一下，这个词我在别的一些地方也用了“复写” (如 config.md、optinons.md 还有 vue-cli、style-guide 等地方)，另外我的输入法、百度关键字推荐等地方似乎都只有“复写”这个词。这里是否可以保持“复写”？🙂
谢谢
There was a problem hiding this comment.
抱歉这两天没看通知:joy:
复写: 把复写纸夹在两张或几张纸之间书写,能写成一式多份(http://www.zdic.net/c/d/152/339032.htm, https://baike.baidu.com/item/%E5%A4%8D%E5%86%99)
英语中对应的是Copywriting
汉语词典本身没有“覆写”这个词，"覆"也没有"复"常用，所以输入法没有收录。但鉴于over是覆盖的意思，用"覆"可能更为恰当
|
@eddyerburgh @fnlctrl Btw, seems this PR has been reviewed and is close to be approved, I'd like to create another PR separately for removing Chai ref if you two don't mind :-) |
This was referenced Feb 26, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref: 865c526...6fa6e06
/ping @fnlctrl
Thanks.