Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: WICG/webcomponents
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: gh-pages
Choose a base ref
...
head repository: w3c-html-ig-zh/webcomponents
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: gh-pages
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Aug 5, 2014

  1. 在index.html增加了中文文档的链接

    勾股 committed Aug 5, 2014
    Copy the full SHA
    72b876b View commit details
  2. Copy the full SHA
    0c40f77 View commit details

Commits on Aug 6, 2014

  1. first version

    辉希 committed Aug 6, 2014
    Copy the full SHA
    a5b90dd View commit details
  2. Update: translate

    正霖 committed Aug 6, 2014
    Copy the full SHA
    f9fce68 View commit details
  3. Update: translate to section 6

    正霖 committed Aug 6, 2014
    Copy the full SHA
    507d567 View commit details

Commits on Aug 7, 2014

  1. Merge branch 'zh' into 'zh'

    Zh
    勾股 committed Aug 7, 2014
    Copy the full SHA
    a28dd82 View commit details
  2. Update: translate to 7.3

    正霖 committed Aug 7, 2014
    Copy the full SHA
    62e43a7 View commit details
  3. Shadow的第一章

    勾股 committed Aug 7, 2014
    Copy the full SHA
    4b778a7 View commit details
  4. Shadow的第二章

    勾股 committed Aug 7, 2014
    Copy the full SHA
    147006a View commit details
  5. Merge branch 'zh-shadow' into 'zh'

    shadow dom 1 ~ 2
    勾股 committed Aug 7, 2014
    Copy the full SHA
    dfe7a64 View commit details

Commits on Aug 8, 2014

  1. Update: translate to 7.5

    正霖 committed Aug 8, 2014
    Copy the full SHA
    028b80d View commit details
  2. Update: translate to 9.2

    正霖 committed Aug 8, 2014
    Copy the full SHA
    47858e4 View commit details

Commits on Aug 10, 2014

  1. 第6章翻译完成

    辉希 committed Aug 10, 2014
    Copy the full SHA
    5ea4083 View commit details

Commits on Aug 11, 2014

  1. Update: translate complete - alpha 1

    正霖 committed Aug 11, 2014
    Copy the full SHA
    1138f60 View commit details
  2. 第七章翻译完成

    辉希 committed Aug 11, 2014
    Copy the full SHA
    548d2b5 View commit details

Commits on Aug 12, 2014

  1. Update: refine some translation

    正霖 committed Aug 12, 2014
    Copy the full SHA
    490a3e3 View commit details
  2. 第八章翻译完成

    辉希 committed Aug 12, 2014
    Copy the full SHA
    0478932 View commit details

Commits on Aug 13, 2014

  1. Update: refine some translation

    正霖 committed Aug 13, 2014
    Copy the full SHA
    a2d61ad View commit details
  2. Update: refine some translation

    正霖 committed Aug 13, 2014
    Copy the full SHA
    416ce14 View commit details
  3. Merge branch 'zh' into 'zh'

    HTML Imports Spec Translation
    
    alpha version
    勾股 committed Aug 13, 2014
    Copy the full SHA
    0c0da6f View commit details
  4. 第9章翻译完成

    辉希 committed Aug 13, 2014
    Copy the full SHA
    c04f40a View commit details

Commits on Aug 14, 2014

  1. 第十章翻译完成和后序

    辉希 committed Aug 14, 2014
    Copy the full SHA
    629f2a3 View commit details
  2. Merge branch 'zh' into 'zh'

    Zh
    
    6-9章
    勾股 committed Aug 14, 2014
    Copy the full SHA
    183daca View commit details
  3. Merge branch 'zh' into zh-shadow-3

    勾股 committed Aug 14, 2014
    Copy the full SHA
    c41b6c1 View commit details
  4. 翻译了shadow第3章

    勾股 committed Aug 14, 2014
    Copy the full SHA
    9e98fae View commit details
  5. Merge branch 'zh-shadow-3' into 'zh'

    翻译了shadow第3章
    勾股 committed Aug 14, 2014
    Copy the full SHA
    65204fb View commit details
  6. 翻译了shadow的第4章

    勾股 committed Aug 14, 2014
    Copy the full SHA
    1a53855 View commit details
  7. Merge branch 'shadow-4' into 'zh'

    翻译了shadow的第4章
    勾股 committed Aug 14, 2014
    Copy the full SHA
    8f422c1 View commit details

Commits on Aug 18, 2014

  1. 自定义元素翻译

    冰琼 committed Aug 18, 2014
    Copy the full SHA
    9cc399e View commit details

Commits on Aug 19, 2014

  1. Merge branch 'zh' into 'zh'

    Zh
    
    重新请求合并,之前搞错分支了
    勾股 committed Aug 19, 2014
    Copy the full SHA
    79c666e View commit details

Commits on Aug 20, 2014

  1. 第五章翻译完成

    辉希 committed Aug 20, 2014
    Copy the full SHA
    44d6ccc View commit details
  2. 更新回调函数的翻译

    冰琼 committed Aug 20, 2014
    Copy the full SHA
    b994ce5 View commit details
  3. Merge branch 'zh' into 'zh'

    Zh
    
    更新生命周期回调函数的翻译
    勾股 committed Aug 20, 2014
    Copy the full SHA
    81f452f View commit details

Commits on Aug 21, 2014

  1. Merge branch 'zh' of gitlab.alibaba-inc.com:qinghui.tqh/docs-webcompo…

    …nents into zh
    勾股 committed Aug 21, 2014
    Copy the full SHA
    8d72b72 View commit details

Commits on Aug 28, 2014

  1. Update README.md

    Jinjiang committed Aug 28, 2014
    Copy the full SHA
    bd0ea18 View commit details
  2. Update README.md

    Jinjiang committed Aug 28, 2014
    Copy the full SHA
    fb2796f View commit details
  3. Update README.md

    Jinjiang committed Aug 28, 2014
    Copy the full SHA
    9ed0695 View commit details
  4. Update README.md

    Jinjiang committed Aug 28, 2014
    Copy the full SHA
    b82dab8 View commit details

Commits on Aug 29, 2014

  1. 章节序号 词汇统一

    辉希 committed Aug 29, 2014
    Copy the full SHA
    18c6b52 View commit details
  2. Merge branch 'zh' into 'zh'

    Zh
    
    词汇统一 章节序号
    勾股 committed Aug 29, 2014
    Copy the full SHA
    9f640fb View commit details

Commits on Aug 30, 2014

  1. 修改了个别词的译法

    勾股 committed Aug 30, 2014
    Copy the full SHA
    1baf18c View commit details
  2. Merge branch 'zh' of gitlab.alibaba-inc.com:jinjiang.zjj/docs-webcomp…

    …onents into zh
    勾股 committed Aug 30, 2014
    Copy the full SHA
    d1d9d59 View commit details

Commits on Sep 1, 2014

  1. Fix: div doesnot close

    正霖 committed Sep 1, 2014
    Copy the full SHA
    7282332 View commit details
  2. Fix: spin event loop -> 翻阅事件循环

    正霖 committed Sep 1, 2014
    Copy the full SHA
    15be72c View commit details
  3. Merge branch 'zh' into 'zh'

    import fix
    
    * 补上漏掉的div闭合tag
    * spin event loop -> 翻阅事件循环
    勾股 committed Sep 1, 2014
    Copy the full SHA
    404a2db View commit details
  4. 同步 @冰琼 的改动

    勾股 committed Sep 1, 2014
    Copy the full SHA
    c849257 View commit details
  5. Merge branch 'zh' of gitlab.alibaba-inc.com:jinjiang.zjj/docs-webcomp…

    …onents into zh
    勾股 committed Sep 1, 2014
    Copy the full SHA
    b69a13b View commit details
  6. 更新了翻译流程

    勾股 committed Sep 1, 2014
    Copy the full SHA
    d899bc5 View commit details
  7. Merge branch 'zh' into gh-pages

    勾股 committed Sep 1, 2014
    Copy the full SHA
    f5dea38 View commit details

Commits on Sep 13, 2014

  1. 补充了缺漏的图片

    勾股 committed Sep 13, 2014
    Copy the full SHA
    1dfa056 View commit details
Showing with 3,258 additions and 4 deletions.
  1. +61 −0 README.md
  2. +62 −0 explainer-zh/index.html
  3. +8 −4 index.html
  4. +246 −0 spec-zh/custom/custom-elements-whole-world.svg
  5. +893 −0 spec-zh/custom/index.html
  6. +535 −0 spec-zh/imports/index.html
  7. +1,453 −0 spec-zh/shadow/index.html
61 changes: 61 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -7,3 +7,64 @@ This is the repository in which W3C editor's drafts of the Web Components specs
- [Shadow DOM](http://w3c.github.io/webcomponents/spec/shadow/).
- [HTML Imports](http://w3c.github.io/webcomponents/spec/imports/).
- [Custom Elements](http://w3c.github.io/webcomponents/spec/custom/).

## 翻译须知

我们翻译的方式是先翻译目前官方 [github](https://github.com/w3c/webcomponents) 的最新版本。
具体方式是把官方 [github](https://github.com/w3c/webcomponents) 的最新版本派生到一个新的 `zh` 分支,并在这个分支下进行翻译。

### 参与翻译的方式

**为了避免冲突,请务必在翻译之前,在 [issues](https://github.com/w3c-html-ig-zh/webcomponents/issues) 里创建一个 issue,说明你翻译的范围**

在项目首页 **fork** 项目,然后 checkout 到 `zh` 分支,修改相应的文件,翻译好之后记得 commit、push、然后发起从你自己的 `zh` 分支到我的 `zh` 分支的 merge request。

为了保证翻译质量,文档全部翻译完成之后,需要进行至少 2 轮的交叉 review。

#### `zh` 分支新产生的文件及其对应关系

```
webcomponents
├─┬ explainer
│ └── index.html
├─┬ explainer-zh
│ └── index.html 新的 web components 介绍的翻译
├─┬ spec
│ ├─┬ custom
│ │ └── index.html
│ ├─┬ imports
│ │ └── index.html
│ └─┬ shadow
│ └── index.html
└─┬ spec-zh
├─┬ custom
│ └── index.html 新的 custom elements 的翻译
├─┬ imports
│ └── index.html 新的 html imports 的翻译
└─┬ shadow
└── index.html 新的 shadow dom 的翻译
```

### 后续维护

每次翻译更新/结束之后,给版本打一个 tag,并合并到 `gh-pages` 分支。

由于 web components 规范还在不断的迭代完善之中。所以今后我们会不定期把官方 [github](https://github.com/w3c/webcomponents) 的改动合并到我们的 `zh` 分支 (由于我们不修改原有的文件,只产生新的翻译文件,所以除了 `README.md` 文件本身是不可能有冲突的),同时用 `diff` 工具找出版本之间的差异,并生成一个 issue,再把这些收集到的差异体现在翻译上,生成新的翻译的版本,打一个 tag,再关闭该 issue。

#### tag 命名方式

形如 `zh-v{X}.{Y}`,其中:

* `{X}` 为原文的版本,每次产生一个新的原文版本,版本号 +1
* `{Y}` 为翻译的版本,每次产生一个新的原文版本,版本号归 0,每次产生一个新的译文版本,版本号 +1

#### 翻译流程举例

假设 `zh-v5.0` 是当前的原文版本:

1. 如果官方产生了新的版本,则打一个 `zh-v6.0`,将 w3c remote 原文合并到 `zh`,产生一个 issue: `v6`
2.`zh` 翻译之后,打一个 `zh-v6.1`,译文合并到 `gh-pages` 并发布,关闭 issue: `v6`
3. 然后又发现了一些翻译失误,在 `zh` 修正之后,译文合并到 `gh-pages` 并发布,打一个 `zh-v6.2`
4. 官方又产生了新的版本,则打一个 `zh-v7.0`,将 w3c remote 原文合并到 `zh`,产生一个 issue: `v7`
5. 以此类推……

62 changes: 62 additions & 0 deletions explainer-zh/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<!DOCTYPE html>
<html lang="en"><head>
<title>Web Components 简介</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/W3C-WG-NOTE" type="text/css">
</head>

<body>

<div class="head">

<div class="logo">
<a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a>
</div>

<h1>Web Components 简介</h1>
<h2 id="wg-note">W3C Working Group Note 24,7,2014</h2>
<dl>
<dt>当前版本</dt>
<dd><a href="http://www.w3.org/TR/2014/NOTE-components-intro-20140724/">http://www.w3.org/TR/2014/NOTE-components-intro-20140724/</a></dd>
<dt>最新版本</dt>
<dd><a href="http://www.w3.org/TR/components-intro/">http://www.w3.org/TR/components-intro/</a></dd>
<dt>最新编辑草案</dt>
<dd><a href="http://w3c.github.io/webcomponents/explainer/">http://w3c.github.io/webcomponents/explainer/</a></dd>
<dt>上一版本</dt>
<dd><a href="http://www.w3.org/TR/2013/WD-components-intro-20130606/">http://www.w3.org/TR/2013/WD-components-intro-20130606/</a></dd>
<dt>校订历史</dt>
<dd><a href="https://github.com/w3c/webcomponents/commits/gh-pages/explainer/">https://github.com/w3c/webcomponents/commits/gh-pages/explainer/</a></dd>
<dt>参与制定</dt>
<dd>讨论 <a href="http://lists.w3.org/Archives/Public/public-webapps/">public-webapps@w3.org</a> (<a href="http://www.w3.org/2008/webapps/">Web Applications Working Group(Web应用工作组)</a>)</dd>
<dd><a href="https://www.w3.org/Bugs/Public/enter_bug.cgi?comment=&amp;blocked=14949&amp;short_desc=%5BExplainer%5D%3A%20&amp;product=WebAppsWG&amp;component=Component%20Model">File bugs(提交bug)</a> (w3.org's <a href="https://www.w3.org/Bugs/Public/">Bugzilla(bug跟踪)</a>)</dd>
<dt>校订者</dt>
<dd class="vcard"><span class="fn">Dimitri Glazkov</span>, <span class="org">Google</span>, &lt;<a class="email" href="mailto:dglazkov@chromium.org">dglazkov@chromium.org</a>&gt;</dd>
<dd class="vcard"><span class="fn">Hayato Ito</span>, <span class="org">Google</span>, &lt;<a class="email" href="mailto:hayato@google.com">hayato@google.com</a>&gt;</dd>
<dt>标准作者</dt>
<dd class="vcard"><span class="fn">Dominic Cooney</span>, <span class="org">Google</span>, &lt;<a class="email" href="mailto:dglazkov@chromium.org">dominicc@google.com</a>&gt;</dd>
</dl>

<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">版权</a> © 2014 <a href="http://www.w3.org/"><abbr title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.eu/"><abbr title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>), 版权所有 W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> 规则适用.</p>

<hr>

<h2 id="abstract">摘要</h2>

<p>本文档是非规范性参考文档, 文档提供关于Web Components的概述.文档总结Web Components标准的信息,针对各个技术规范作出了由浅入深的说明.</p>

<h2 id="status">当前文档状态</h2>

<p><em>这里公布了目前文档的状态. 其它文档有可能替代本文档. 目前<abbr title="World Wide Web Consortium">W3C</abbr> 公布的一系列关于Web Components的最新修正过的技术文档可以通过<a href="http://www.w3.org/TR/"><abbr title="World Wide Web Consortium">W3C</abbr> technical reports index</a> at http://www.w3.org/TR/.</em>查询</p>

<p><strong>本文档已经停止更新,不应再用来被参考. 许多关于Web Components的在线资源都是有效的, 其中包括<a href="http://www.w3.org/wiki/WebComponents/">Web Components wiki</a>.
</strong></p>

<p><a href="http://www.w3.org/2008/webapps/">Web Applications Working Group(Web应用工作组)</a>公布本文档作为工作组的记录. 如果你希望对本文档提出更加合理的意见, 请将你的建议发送<a href="mailto:public-webapps@w3.org">public-webapps@w3.org</a> (<a href="mailto:public-webapps-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-webapps/">archives</a>). 所有的合理建议我们都非常欢迎</p>
<p>一个工作组的记录公布并不意味着已经取得<abbr title="World Wide Web Consortium">W3C</abbr>小组成员的认可.这份草案文档可能会随时被其它文档更新,取代,废除. 除了本文档的修订工作,本文档不适合被引用.</p>

<p>本文档的制作是通过一个小组来维护,符合<a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5,2,2004 <abbr title="World Wide Web Consortium">W3C</abbr>专利政策</a>. <abbr title="World Wide Web Consortium">W3C</abbr> 维护了一个<a href="http://www.w3.org/2004/01/pp-impl/42538/status" rel="disclosure">公开的专利列表</a> 关系到小组的可交付的专利; 专利列表页面包含了每一个公开的专利. 个体认为所拥有的实际的专利知识包含在<a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> 中的必须公开和 <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure"><abbr title="World Wide Web Consortium">W3C</abbr>专利政策</a>第6部分中的相关的信息</p>

</div>

</body>
</html>
12 changes: 8 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
@@ -6,10 +6,14 @@
<body>
<h1>Web Components Specifications</h1>
<ul>
<li><a href="explainer/">Introduction to Web Components</a></li>
<li><a href="spec/shadow/">Shadow DOM</a></li>
<li><a href="spec/imports/">HTML Imports</a></li>
<li><a href="spec/custom/">Custom Elements</a></li>
<li><a href="explainer/">Introduction to Web Components</a> <a href="explainer-zh/">(中文)</a>
</li>
<li><a href="spec/shadow/">Shadow DOM</a> <a href="spec-zh/shadow/">(中文)</a>
</li>
<li><a href="spec/imports/">HTML Imports</a> <a href="spec-zh/imports/">(中文)</a>
</li>
<li><a href="spec/custom/">Custom Elements</a> <a href="spec-zh/custom/">(中文)</a>
</li>
</ul>
</body>
</html>
Loading