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

Update site config for l10n teams and 1.11 info #10667

Merged
merged 1 commit into from
Oct 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 3 additions & 12 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
# Reviewers can /lgtm /approve but not sufficient for auto-merge without an
# approver
reviewers:
- zhangxiaoyu-zidif
- xiangpengzhao
- stewart-yu
- Rajakavitha1
- sig-docs-en-reviews

# Approvers have all the ability of reviewers but their /approve makes
# auto-merge happen if a /lgtm exists, or vice versa, or they can do both
# No need for approvers to also be listed as reviewers
approvers:
- heckj
- bradamant3
- bradtopol
- steveperry-53
- zacharysarah
- chenopis
- mistyhacks
- tengqm
- sig-docs-en-owners
90 changes: 83 additions & 7 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ aliases:
- chrislovecnm
- mfburnett
sig-azure: #Microsoft Azure
- slack
- colemickens
- jdumars
- andyzhangx
- feiskyer
- justaugustus
- karataliu
- khenidak
sig-big-data: #GH: sig-big-data-pr-reviews
- foxish
sig-cli: #Team: CLI; GH: sig-cli-pr-reviews; e.g. kubectl
Expand All @@ -61,11 +63,25 @@ aliases:
- smarterclayton
- soltysh
- sttts
sig-cluster-lifecycle: #GH: sig-cluster-lifecycle-pr-reviews
sig-cluster-lifecycle-kubeadm-approvers: # Approving changes to kubeadm documentation
- timothysc
- lukemarsden
- luxas
- roberthbailey
- fabriziopandini
sig-cluster-lifecycle-kubeadm-reviewers: # Reviewing kubeadm documentation
- timothysc
- lukemarsden
- luxas
- roberthbailey
- fabriziopandini
- fabriziopandini
- kad
- xiangpengzhao
- stealthybox
- liztio
- chuckha
- detiber
- dixudx
sig-cluster-ops:
- zehicle
- jdumars
Expand All @@ -81,12 +97,71 @@ aliases:
- apelisse
- grodrigues3
- spxtr
sig-docs: #Team: documentation; GH: sig-docs-pr-reviews
sig-docs: #Team: documentation; GH: sig-docs-maintainers
- bradamant3
- bradtopol
- chenopis
- jaredbhatti
- kbarnard10
- mistyhacks
- ryanmcginnis
- steveperry-53
- tengqm
- tfogo
- xiangpengzhao
- zacharysarah
- zhangxiaoyu-zidif
- zparnold
sig-docs-en-owners: #Team: Documentation; GH: sig-docs-en-owners
- bradamant3
- bradtopol
- heckj
- chenopis
- jaredbhatti
- kbarnard10
- mistyhacks
- ryanmcginnis
- steveperry-53
- stewart-yu
- tengqm
- tfogo
- zacharysarah
- zparnold
sig-docs-en-reviews: #Team: Documentation; GH: sig-docs-pr-reviews
- jimangel
- rajakavitha1
- stewart-yu
- xiangpengzhao
- zhangxiaoyu
sig-docs-ja-owners: #Team: Japanese docs localization; GH: sig-docs-ja-owners
- cstoku
- nasa9084
- tnir
sig-docs-ja-reviews: #Team: Japanese docs PR reviews; GH:sig-docs-ja-reviews
- cstoku
- makocchi-git
- MasayaAoyama
- nasa9084
- tnir
sig-docs-ko-owners: #Team Korean docs localization; GH: sig-docs-ko-owners
- ClaudiaJKang
- gochist
sig-docs-ko-reviews: #Team Korean docs reviews; GH: sig-docs-ko-reviews
- ClaudiaJKang
- gochist
- ianychoi
sig-docs-zh-owners: #Team Chinese docs localization; GH: sig-docs-zh-owners
- dchen1107
- haibinxie
- hanjiayao
- lichuqiang
- tengqm
- xiangpengzhao
- zhangxiaoyu-zidif
sig-docs-zh-reviews: #Team Chinese docs reviews; GH: sig-docs-zh-reviews
- idealhack
- tengqm
- xiangpengzhao
- zhangxiaoyu-zidif
sig-federation: #Team: Federation; e.g. Federated Clusters
- csbell
sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
Expand Down Expand Up @@ -197,3 +272,4 @@ aliases:
- floreks
sig-windows:
- michmike

101 changes: 70 additions & 31 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ enableRobotsTXT = true

disableKinds = ["taxonomy", "taxonomyTerm"]

ignoreFiles = [ "^OWNERS$", "README.md", "^node_modules$" ]
ignoreFiles = [ "^OWNERS$", "README[-]+[a-z]*\\.md", "^node_modules$", "content/en/docs/doc-contributor-tools" ]

contentDir = "content/en"

Expand All @@ -19,6 +19,12 @@ pygmentsUseClasses = false
# See https://help.farbox.com/pygments.html
pygmentsStyle = "emacs"

# Enable Git variables like commit, lastmod
enableGitInfo = true

# Norwegian ("no") is sometimes but not currently used for testing.
disableLanguages = ["no"]

[blackfriday]
hrefTargetBlank = true
fractions = false
Expand All @@ -27,49 +33,79 @@ fractions = false
date = ["date", ":filename", "publishDate", "lastmod"]

[permalinks]
blog = "/:section/:year/:month/:day/:slug/"
blog = "/:section/:year/:month/:day/:slug/"

# Be explicit about the output formats. We (currently) only want an RSS feed for the home page.
[outputs]
home = [ "HTML", "RSS"]
home = [ "HTML", "RSS", "HEADERS" ]
page = [ "HTML"]
section = [ "HTML"]

# Add a "text/netlify" media type for auto-generating the _headers file
[mediaTypes]
[mediaTypes."text/netlify"]
delimiter = ""

[outputFormats]
[outputFormats.RSS]
baseName = "feed"

# _headers file output (uses the template at layouts/index.headers)
[outputFormats.HEADERS]
mediatype = "text/netlify"
baseName = "_headers"
isPlainText = true
notAlternative = true

[params]

time_format_blog = "Monday, January 02, 2006"
description = "Production-Grade Container Orchestration"
showedit = true

latest = "v1.11"
latest = "v1.12"

fullversion = "v1.11.0"
fullversion = "v1.11.3"
version = "v1.11"
githubbranch = "master"
docsbranch = "master"
deprecated = false
githubbranch = "v1.11.3"
docsbranch = "release-1.11"
deprecated = true
currentUrl = "https://kubernetes.io/docs/home/"
nextUrl = "http://kubernetes-io-vnext-staging.netlify.com/"
nextUrl = "https://kubernetes-io-vnext-staging.netlify.com/"
githubWebsiteRepo = "github.com/kubernetes/website"
githubWebsiteRaw = "raw.githubusercontent.com/kubernetes/website"

[params.pushAssets]
css = [
"callouts",
"styles",
"custom-jekyll/tags"
]
js = [
"custom-jekyll/tags",
"script"
]

[[params.versions]]
tfogo marked this conversation as resolved.
Show resolved Hide resolved
fullversion = "v1.11.0"
fullversion = "v1.12.0"
version = "v1.12"
githubbranch = "v1.12.0"
docsbranch = "release-1.12"
url = "https://kubernetes.io"

[[params.versions]]
fullversion = "v1.11.3"
version = "v1.11"
githubbranch = "v1.11.0"
githubbranch = "v1.11.3"
docsbranch = "release-1.11"
url = "https://kubernetes.io"
url = "https://v1-11.docs.kubernetes.io"

[[params.versions]]
fullversion = "v1.10.3"
version = "v1.10"
githubbranch = "v1.10.3"
docsbranch = "release-1.10"
url = "https://kubernetes.io"
url = "https://v1-10.docs.kubernetes.io"

[[params.versions]]
fullversion = "v1.9.7"
Expand All @@ -78,21 +114,6 @@ githubbranch = "v1.9.7"
docsbranch = "release-1.9"
url = "https://v1-9.docs.kubernetes.io"

[[params.versions]]
fullversion = "v1.8.4"
version = "v1.8"
githubbranch = "v1.8.4"
docsbranch = "release-1.8"
url = "https://v1-8.docs.kubernetes.io"

[[params.versions]]
fullversion = "v1.7.6"
version = "v1.7"
githubbranch = "v1.7.6"
docsbranch = "release-1.7"
url = "https://v1-7.docs.kubernetes.io"


# Language definitions.

[languages]
Expand All @@ -102,11 +123,29 @@ description = "Production-Grade Container Orchestration"
languageName ="English"
# Weight used for sorting.
weight = 1
[languages.cn]

[languages.zh]
title = "Kubernetes"
description = "Production-Grade Container Orchestration"
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this description use Chinese? Same concern for below languages.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If the team would like to submit a PR for Chinese strings after this PR merges, that would be awesome. 👍

languageName ="Chinese"
languageName = "中文 Chinese"
weight = 2
contentDir = "content/cn"
contentDir = "content/zh"

[languages.ko]
title = "Kubernetes"
description = "Production-Grade Container Orchestration"
languageName = "한국어 Korean"
weight = 3
contentDir = "content/ko"

[languages.no]
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't see content/no/OWNERS file for this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@xiangpengzhao It's not strictly needed, as content/no/ is currently a test directory.

title = "Kubernetes"
description = "Production-Grade Container Orchestration"
languageName ="Norsk"
weight = 4
contentDir = "content/no"

Copy link
Contributor

Choose a reason for hiding this comment

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

Missed languages.ja?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@xiangpengzhao The team hasn't indicated that they've met the minimum milestones yet. @cstoku Any updates on progress?

[languages.no.params]
time_format_blog = "02.01.2006"
# A list of language codes to look for untranslated content, ordered from left to right.
language_alternatives = ["en"]
11 changes: 11 additions & 0 deletions content/en/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This is the directory for English source content.
# Teams and members are visible at https://github.com/orgs/kubernetes/teams.

reviewers:
- sig-docs-en-reviews

approvers:
- sig-docs-en-owners

labels:
- language/en
11 changes: 11 additions & 0 deletions content/ja/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This is the localization project for Japanese.
# Teams and members are visible at https://github.com/orgs/kubernetes/teams.

reviewers:
- sig-docs-ja-reviews

approvers:
- sig-docs-ja-owners

labels:
- language/ja
11 changes: 11 additions & 0 deletions content/ko/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This is the localization project for Korean.
# Teams and members are visible at https://github.com/orgs/kubernetes/teams.

reviewers:
- sig-docs-ko-reviews

approvers:
- sig-docs-ko-owners

labels:
- language/ko
11 changes: 11 additions & 0 deletions content/zh/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This is the localization project for Chinese.
# Teams and members are visible at https://github.com/orgs/kubernetes/teams.

reviewers:
- sig-docs-zh-reviews

approvers:
- sig-docs-zh-owners

labels:
- language/zh
2 changes: 1 addition & 1 deletion layouts/shortcodes/deprecationwarning.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="content deprecation-warning">
<h3>
Documentation for Kubernetes {{ .Page.Param "version" }} is no longer actively maintained. The version you are currently viewing is a static snapshot.
For up-to-date documentation, see the <a href="{{ .Params.currentUrl }}">latest</a> version.
For up-to-date documentation, see the <a href="{{ .Site.Params.currentUrl }}">latest</a> version.
</h3>
</div>
</main>
Expand Down