Skip to content
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

Multiple Language Support + Complete Chinese Translation #48

Merged
merged 56 commits into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
0494566
dropdown - init
ulivz Apr 14, 2018
121e6ca
add nav link component to distinguish internal and external link
ulivz Apr 14, 2018
3ddca36
enhance the active state of dropdown link
ulivz Apr 14, 2018
72be30c
beautify font weight for dropdown link and clean code
ulivz Apr 14, 2018
4bccf3a
clean code
ulivz Apr 14, 2018
5ac3c2a
update doc
ulivz Apr 14, 2018
dbb7a08
update README
ulivz Apr 14, 2018
50689ea
address comments
ulivz Apr 14, 2018
6de2efa
fix jumpy link
ulivz Apr 14, 2018
a760d59
i18n - init
ulivz Apr 14, 2018
7eb2563
address comments
ulivz Apr 14, 2018
94c2236
use exact match mode for route link
ulivz Apr 14, 2018
0c53333
Merge branch 'dropdown' into i18n
ulivz Apr 14, 2018
e30c580
support configurable i18n
ulivz Apr 14, 2018
c6188b9
translate README of guide
ulivz Apr 14, 2018
d414794
tweaks translations and update the actionLink
ulivz Apr 14, 2018
8a131a9
add sidebar config for zh
ulivz Apr 14, 2018
711e772
translate basic-config and getting-started
ulivz Apr 14, 2018
34d8d78
refactor code
ulivz Apr 14, 2018
6c9e1a4
implement nested links in dropdown
ulivz Apr 14, 2018
5ca1d02
clean dropdown type
ulivz Apr 14, 2018
7c6d462
fix cursor status
ulivz Apr 14, 2018
96c30c5
chore: tweaks
ulivz Apr 15, 2018
3397dc2
Merge branch 'master' into dropdown
ulivz Apr 15, 2018
f8e10cf
Merge branch 'dropdown' into i18n
ulivz Apr 15, 2018
7ea050e
zh - translate guide/assets
ulivz Apr 15, 2018
00e6430
zh - translate guide/markdown
ulivz Apr 15, 2018
dbf07fb
zh - translate guide/using-vue
ulivz Apr 15, 2018
9506184
zh - translate guide/custom-themes
ulivz Apr 15, 2018
8a900a4
zh - translate guide/deploy
ulivz Apr 15, 2018
79eff60
zh - translate /config/
ulivz Apr 15, 2018
01ab22e
zh - translate /default-theme-config/
ulivz Apr 15, 2018
08d80b1
correct some mistakes in Chinses translation.
ulivz Apr 15, 2018
6ebbd88
refactor docs
ulivz Apr 15, 2018
eee3ac7
style: tweaks style of navbar to fully follow sidebar at mobile side.
ulivz Apr 15, 2018
a811af5
refactor Chinese translations
ulivz Apr 15, 2018
5030421
Merge branch 'master' into dropdown
ulivz Apr 16, 2018
96a6cc6
refactor: address comments and clean duplicate code due to merging.
ulivz Apr 16, 2018
7f440d0
style: use more exact class selector, and clean old element selector …
ulivz Apr 16, 2018
069d677
Merge branch 'dropdown' into multiple-language-support
ulivz Apr 16, 2018
645c22d
chore: fix merge conflict
ulivz Apr 16, 2018
028669b
Merge branch 'master' into multiple-language-support
ulivz Apr 16, 2018
2d76589
support multiple langs for title and homepage link
ulivz Apr 17, 2018
ddf759f
handle for lang and description - dev & build
ulivz Apr 17, 2018
c779dde
handle description meta at dev mode
ulivz Apr 17, 2018
5c7190d
Merge branch 'master' into multiple-language-support
ulivz Apr 17, 2018
e64fd82
translate latest updated doc
ulivz Apr 17, 2018
4e769a6
Complete proofreading
ulivz Apr 17, 2018
beac14f
feat: Auto-generated language dropdown if user configured langs
ulivz Apr 17, 2018
b8dc3f0
feat: Try to stay on the current page When user switch the language
ulivz Apr 17, 2018
f2fb2d9
chore: clean code
ulivz Apr 17, 2018
4f1b004
chore: clean code
ulivz Apr 17, 2018
c5a2079
fix: typo
ulivz Apr 17, 2018
961cf2d
feat: support override description meta with yaml front matter
ulivz Apr 18, 2018
1c31f82
replace those IE11-incompatible API with ES5
ulivz Apr 18, 2018
b794126
docs: document config.host for zh-CN
ulivz Apr 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 108 additions & 5 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
const base = process.env.GH ? '/vuepress/' : '/'

const langs = [
{ text: 'English', link: '/' },
{ text: '简体中文', link: '/zh/' },
]

module.exports = {
title: 'VuePress',
description: 'Vue-powered Static Site Generator',
Expand All @@ -18,6 +13,114 @@ module.exports = {
repo: 'vuejs/vuepress',
editLinks: true,
docsDir: 'docs',
nav: [
{
text: 'Guide',
link: '/guide/',
},
{
text: 'Config Reference',
link: '/config/'
},
{
text: 'Default Theme Config',
link: '/default-theme-config/'
},
{
text: 'Links',
items: [
{
text: 'Vue',
link: 'https://vuejs.org/',
},
{
text: 'Vue-Router',
link: 'https://router.vuejs.org/en/',
},
{
text: 'Vue-CLI',
link: 'https://github.com/vuejs/vue-cli/blob/dev/docs/README.md',
},
{
text: 'Vue-Press',
link: '/',
},
]
},
{
text: 'Ecosystem',
items: [
{
text: 'Help',
items: [
{
text: 'Forum',
link: 'https://forum.vuejs.org/'
},
{
text: 'Chat',
link: 'https://chat.vuejs.org/'
}
]
},
{
text: 'Tooling',
items: [
{
text: 'Devtools',
link: 'https://github.com/vuejs/vue-devtools'
},
{
text: 'Webpack Template',
link: 'https://vuejs-templates.github.io/webpack'
},
{
text: 'Vue Loader',
link: 'https://vue-loader.vuejs.org'
}
]
},
{
text: 'News',
items: [
{
text: 'Weekly News',
link: 'https://news.vuejs.org'
},
{
text: 'Roadmap',
link: 'https://github.com/vuejs/roadmap'
},
{
text: 'Twitter',
link: 'https://twitter.com/vuejs'
},
{
text: 'Blog',
link: 'https://medium.com/the-vue-point'
},
{
text: 'Jobs',
link: 'https://vuejobs.com/?ref=vuejs'
}
]
},
{
text: 'Resource Lists',
items: [
{
text: 'Vue Curated',
link: 'https://curated.vuejs.org/'
},
{
text: 'Awesome Vue',
link: 'https://github.com/vuejs/awesome-vue'
}
]
}
]
}
],
nav: {
default: [
{
Expand Down
3 changes: 2 additions & 1 deletion lib/default-theme/NavLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
class="router-link"
:to="link"
v-if="!isExternal(link)"
exact
:exact="link === '/'"
>{{ item.text }}</router-link>
<a
v-else
:href="link"
target="_blank"
class="router-link"
rel="noopener noreferrer"
>{{ item.text }}</a>
</template>

Expand Down
24 changes: 14 additions & 10 deletions lib/default-theme/NavLinks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
<span class="arrow"></span>
<ul class="nav-dropdown">
<li
class="dropdown-item"
v-for="subItem in item.items"
:key="subItem.link">
<h4 v-if="subItem.type === 'links'">{{ subItem.text }}</h4>
<ul v-if="subItem.type === 'links'">
<ul class="dropdown-subitem-wrapper" v-if="subItem.type === 'links'">
<li
class="dropdown-subitem"
v-for="childSubItem in subItem.items"
:key="childSubItem.link">
<nav-link :item="childSubItem"></nav-link>
Expand All @@ -42,8 +44,8 @@

<script>
import OutboundLink from './OutboundLink.vue'
import NavLink from './NavLink.vue'
import { isActive, resolveNavLinkItem } from './util'
import NavLink from './NavLink.vue'

export default {
components: { OutboundLink, NavLink },
Expand Down Expand Up @@ -106,9 +108,18 @@ export default {
border-right 4px solid transparent
border-top 5px solid #ccc
.nav-dropdown
li
.dropdown-item
color inherit
line-height 1.7rem
h4
margin 0.45rem 0 0
border-top 1px solid #eee
padding 0.45rem 1.5rem 0 1.25rem
.dropdown-subitem-wrapper
padding 0
list-style none
.dropdown-subitem
font-size 0.9em
a
display block
height 1.7rem
Expand Down Expand Up @@ -136,13 +147,6 @@ export default {
margin-top 0
padding-top 0
border-top 0
& > h4
margin 0.45rem 0 0
border-top 1px solid #eee
padding 0.45rem 1.5rem 0 1.25rem
& > ul
padding 0
list-style none
.github-link
margin-left 1.5rem

Expand Down
25 changes: 14 additions & 11 deletions lib/default-theme/Sidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import SidebarGroup from './SidebarGroup.vue'
import SidebarLink, { groupHeaders } from './SidebarLink.vue'
import NavLinks from './NavLinks.vue'
import { isActive } from './util'
import { isActive, resolveSidebarItems } from './util'

export default {
components: { SidebarGroup, SidebarLink, NavLinks },
Expand Down Expand Up @@ -92,16 +92,19 @@ function resolveOpenGroupIndex (route, items) {
display inline-block
margin-bottom 0.5rem
.nav-dropdown
li a, h4
font-size 15px
height 2rem
line-height 2rem
h4
border-top 0
margin-top 0
padding-top 0
ul > li
padding-left 1rem
.dropdown-item
h4
border-top 0
margin-top 0
padding-top 0
h4, & > a
font-size 15px
height 2rem
line-height 2rem
.dropdown-subitem
font-size 14px
padding-left 1rem

.sidebar-links
margin-top 1.5rem

Expand Down