Skip to content
This repository has been archived by the owner on Aug 8, 2022. It is now read-only.

Commit

Permalink
Merge pull request #4 from vuejs/docs-veaba
Browse files Browse the repository at this point in the history
docs: updated vue-next version number to 3.0.0.-rc.9,and translate examples/*
  • Loading branch information
Jinjiang authored Aug 30, 2020
2 parents b34ea04 + 1e7f123 commit 5c2ce0c
Show file tree
Hide file tree
Showing 25 changed files with 214 additions and 197 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,5 @@ dist/
# Temporary folders
tmp/
temp/
.idea/
.idea/
.vscode/
4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

2 changes: 1 addition & 1 deletion src/.vuepress/components/MigrationBadges.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default {
type: Array,
default: () => [],
validator(value) {
return validBadges.includes(value)
return value.every(badge => validBadges.includes(badge))
}
}
}
Expand Down
42 changes: 21 additions & 21 deletions src/.vuepress/components/community/team/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div>
<div class="team">
<h2 id="active-core-team-members">
Active Core Team Members
核心团队活跃成员
<GetPositionButton
v-if="!userPosition"
@positionRetrieved="setUserPosition"
Expand All @@ -11,35 +11,35 @@
</h2>

<div v-if="errorGettingLocation" class="danger custom-block">
<p>Failed to get your location.</p>
<p>无法获取你的位置。</p>
</div>

<p>
The development of Vue and its ecosystem is guided by an international team, some of whom have chosen to be featured below.
Vue 的研发及其生态建设出自一个国际化的团队,这里会展示其中部分团队成员的信息。
</p>

<div v-if="userPosition" class="tip custom-block">
<p>The core team have been sorted by their distance from you.</p>
<p>核心团队成员已经根据他们与你的距离进行了排序。</p>
</div>

<VuerProfile v-for="profile in members" :key="profile.name" :profile="profile" :use-miles="useMiles"/>
<VuerProfile v-for="profile in members" :key="profile.name" :profile="profile" :use-miles="useMiles" />
</div>

<div class="team">
<h2 id="core-team-emeriti">
Core Team Emeriti
核心团队荣誉成员
</h2>

<p>
Here we honor some no-longer-active core team members who have made valuable contributions in the past.
我们在此致敬过去曾做出过突出贡献的不再活跃的团队成员。
</p>

<VuerProfile v-for="profile in emeriti" :key="profile.name" :profile="profile" :use-miles="useMiles"/>
<VuerProfile v-for="profile in emeriti" :key="profile.name" :profile="profile" :use-miles="useMiles" />
</div>

<div class="team">
<h2 id="community-partners">
Community Partners
社区伙伴
<GetPositionButton
v-if="!userPosition"
@positionRetrieved="setUserPosition"
Expand All @@ -48,18 +48,18 @@
</h2>

<div v-if="errorGettingLocation" class="danger custom-block">
<p>Failed to get your location.</p>
<p>无法获取你的位置。</p>
</div>

<p>
Some members of the Vue community have so enriched it, that they deserve special mention. We've developed a more intimate relationship with these key partners, often coordinating with them on upcoming features and news.
一些 Vue 的社区成员让这里变得更加丰富多彩,有必要在此特别提及。我们与这些主要合作伙伴建立了更加亲密的关系,经常与他们就即将到来的功能和新闻展开协作。
</p>

<div v-if="userPosition" class="tip custom-block">
<p>The community partners have been sorted by their distance from you.</p>
<p>社区合作伙伴已经按照他们与你的距离进行了排序。</p>
</div>

<VuerProfile v-for="profile in partners" :key="profile.name" :profile="profile" :use-miles="useMiles"/>
<VuerProfile v-for="profile in partners" :key="profile.name" :profile="profile" :use-miles="useMiles" />
</div>
</div>
</template>
Expand All @@ -74,7 +74,7 @@ const imperialLanguageCodes = ['en-US', 'en-MY', 'en-MM', 'en-BU', 'en-LR', 'my'
const cityCoordsFor = {
'Annecy, France': [45.899247, 6.129384],
'Alicante, Spain' : [38.346543, -0.483838],
'Alicante, Spain': [38.346543, -0.483838],
'Amsterdam, Netherlands': [4.895168, 52.370216],
'Atlanta, GA, USA': [33.749051, -84.387858],
'Bangalore, India': [12.971599, 77.594563],
Expand Down Expand Up @@ -113,7 +113,7 @@ const cityCoordsFor = {
'Wrocław, Poland': [51.107885, 17.038538],
'Boston, MA, USA': [42.360081, -71.058884],
'Kyiv, Ukraine': [50.450100, 30.523399],
'Washington, DC, USA': [38.8935755,-77.0846156,12],
'Washington, DC, USA': [38.8935755, -77.0846156, 12],
'Kraków, Poland': [50.064650, 19.936579],
'Oslo, Norway': [59.911491, 10.757933],
'Kanagawa, Japan': [35.44778, 139.6425]
Expand All @@ -134,27 +134,27 @@ export default {
}),
computed: {
members () {
members() {
return this.sortByDistance(members)
},
partners () {
partners() {
return this.sortByDistance(partners)
}
},
methods: {
setUserPosition (position) {
setUserPosition(position) {
this.userPosition = position
this.errorGettingLocation = false
},
setUserPositionError () {
setUserPositionError() {
this.userPosition = null
this.errorGettingLocation = true
},
sortByDistance (vuers) {
sortByDistance(vuers) {
if (!this.userPosition) {
return vuers
}
Expand Down Expand Up @@ -190,7 +190,7 @@ export default {
}
},
mounted () {
mounted() {
this.useMiles = imperialLanguageCodes.includes(window.navigator.language)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/.vuepress/components/community/team/vuer-language.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default {
title () {
if (this.highlighted) {
return `${this.vuerName} can give technical talks in your preferred language.`
return `${this.vuerName} 可以用你的偏好语言进行技术讲座。`
}
return this.name
Expand Down
6 changes: 3 additions & 3 deletions src/.vuepress/components/community/themes/index.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div class="themes">
<theme-provider v-for="provider in providers" :key="provider.name" :provider="provider" />
<theme-provider v-for="provider in providers" :key="provider.name" :provider="provider"/>

<p>
Want to feature your themes here?
<a href="mailto:evan@vuejs.org?subject=Theme+affiliation">Contact us</a>!
想在这里展示你的主题吗?
<a href="mailto:evan@vuejs.org?subject=Theme+affiliation">联系我们</a>
</p>
</div>
</template>
Expand Down
24 changes: 11 additions & 13 deletions src/.vuepress/components/community/themes/theme-provider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@
<section>
<h2 :id="provider.name">{{ provider.name }}</h2>

<div class="tip custom-block description" v-html="description"/>
<div class="tip custom-block description" v-html="description" />

<div class="themes-grid">
<ThemeItem v-for="theme in provider.products" :key="theme.url" :theme="theme"/>
<ThemeItem v-for="theme in provider.products" :key="theme.url" :theme="theme" />
</div>

<div class="see-more-container">
<RoundedButton :url="provider.seeMoreUrl">
See More Themes from {{ provider.name }}
</RoundedButton>
<RoundedButton :url="provider.seeMoreUrl">查看 {{ provider.name }} 的更多主题</RoundedButton>
</div>
</section>
</template>
Expand All @@ -23,25 +21,25 @@ export default {
props: {
provider: {
type: Object,
required: true
}
required: true,
},
},
components: {
ThemeItem: () => import('./theme-item.vue'),
RoundedButton: () => import('@theme/components/ui/RoundedButton.vue')
RoundedButton: () => import('@theme/components/ui/RoundedButton.vue'),
},
computed: {
description () {
return (new showdown.Converter()).makeHtml(this.provider.description)
}
}
description() {
return new showdown.Converter().makeHtml(this.provider.description)
},
},
}
</script>

<style lang="scss" scoped>
@import "@theme/styles/_settings.scss";
@import '@theme/styles/_settings.scss';
.themes-grid {
display: flex;
Expand Down
Loading

0 comments on commit 5c2ce0c

Please sign in to comment.