Skip to content

Sync #c9e1ad4 #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 41 commits into from
Aug 22, 2022
Merged

Sync #c9e1ad4 #509

merged 41 commits into from
Aug 22, 2022

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Aug 17, 2022

Description of Problem

vuejs/docs@be5fe37...c9e1ad4

大部分更新已经在 Evan 的 #487 中覆盖了。

mst101 and others added 30 commits August 4, 2022 08:42
* Missing 'the' in attrs.md

* Update src/guide/components/attrs.md

Co-authored-by: Natalia Tepluhina <[email protected]>
* Minor lexical improvements to composables.md

* Update src/guide/reusability/composables.md

Co-authored-by: skirtle <[email protected]>

Co-authored-by: skirtle <[email protected]>
* fix: fix typo

* fix: fix minor grammar error
This proposal is to remove the usage of the `indexOf` method when testing for the presence of a given character in a string. While `indexOf` is compatible with IE, `includes` is friendlier to newer JavaScript developers and it improves code readability.
Note: these changes are already reflected in the review commits for the
Chinese translation and do not need to be translated.
In multiline example was used message ref for v-model, so example above "message" was changing if we writed something in multiline section.
* fix(PreferenceSwitch): switch-link style overflow

Signed-off-by: Sepush <[email protected]>

* Update .vitepress/theme/components/PreferenceSwitch.vue

Co-authored-by: skirtle <[email protected]>

Co-authored-by: skirtle <[email protected]>
* Fix grammar

* Update src/tutorial/src/step-9/description.md

Co-authored-by: Fuqiao Xue <[email protected]>

Co-authored-by: Fuqiao Xue <[email protected]>
yyx990803 and others added 4 commits August 17, 2022 08:09
# Conflicts:
#	.vitepress/config.ts
#	.vitepress/theme/index.ts
#	src/about/faq.md
#	src/about/releases.md
#	src/about/team/TeamPage.vue
#	src/api/built-in-directives.md
#	src/api/component-instance.md
#	src/api/composition-api-lifecycle.md
#	src/api/options-lifecycle.md
#	src/api/options-misc.md
#	src/api/options-state.md
#	src/api/reactivity-core.md
#	src/guide/best-practices/performance.md
#	src/guide/best-practices/security.md
#	src/guide/built-ins/keep-alive.md
#	src/guide/built-ins/transition.md
#	src/guide/components/async.md
#	src/guide/components/attrs.md
#	src/guide/components/events.md
#	src/guide/components/props.md
#	src/guide/components/slots.md
#	src/guide/extras/composition-api-faq.md
#	src/guide/extras/reactivity-in-depth.md
#	src/guide/extras/reactivity-transform.md
#	src/guide/extras/render-function.md
#	src/guide/reusability/composables.md
#	src/guide/reusability/plugins.md
#	src/guide/scaling-up/routing.md
#	src/guide/scaling-up/sfc.md
#	src/guide/scaling-up/ssr.md
#	src/guide/scaling-up/testing.md
#	src/guide/typescript/overview.md
#	src/partners/components/PartnerHero.vue
#	src/translations/index.md
#	src/tutorial/src/step-2/App/composition.js
#	src/tutorial/src/step-2/App/options.js
#	src/tutorial/src/step-7/description.md
#	src/tutorial/src/step-9/description.md
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels Aug 17, 2022
@netlify
Copy link

netlify bot commented Aug 17, 2022

Deploy Preview for vue-docs-zh-cn ready!

Name Link
🔨 Latest commit 94ce267
🔍 Latest deploy log https://app.netlify.com/sites/vue-docs-zh-cn/deploys/6302dd4e8fb5fd0009ba8ef9
😎 Deploy Preview https://deploy-preview-509--vue-docs-zh-cn.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

Copy link
Member

@Jinjiang Jinjiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

其他:

  • 少了 src/public/images/sponsors/.gitkeep

@vercel
Copy link

vercel bot commented Aug 22, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
cn-vuejs-org ✅ Ready (Inspect) Visit Preview Aug 22, 2022 at 1:37AM (UTC)

@wxsms
Copy link
Member Author

wxsms commented Aug 22, 2022

  • 少了 src/public/images/sponsors/.gitkeep

这个文件在英文仓库是被 delete 的哦 @Jinjiang

@Jinjiang Jinjiang merged commit 7add8c9 into main Aug 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录
Projects
None yet
Development

Successfully merging this pull request may close these issues.