Skip to content

Commit 810f41a

Browse files
committed
HADOOP-4164. Chinese translation of the documentation. (Xuebing Yan via
omalley) git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.17@725520 13f79535-47bb-0310-9956-ffa450edef68
1 parent 14532dc commit 810f41a

File tree

364 files changed

+56808
-5
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+56808
-5
lines changed

.gitignore

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
*~
17+
.classpath
18+
.project
19+
.settings
20+
.svn
21+
build/
22+
conf/masters
23+
conf/slaves
24+
conf/hadoop-env.sh
25+
conf/hadoop-site.xml
26+
conf/capacity-scheduler.xml
27+
docs/api/
28+
logs/
29+
src/contrib/ec2/bin/hadoop-ec2-env.sh
30+
src/contrib/index/conf/index-config.xml
31+
src/docs/build
32+
src/docs/cn/build

CHANGES.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ Hadoop Change Log
22

33
Release 0.17.3 - Unreleased
44

5+
IMPROVEMENTS
6+
7+
HADOOP-4164. Chinese translation of the documentation. (Xuebing Yan via
8+
omalley)
9+
510
BUG FIXES
611

712
HADOOP-4277. Checksum verification was mistakenly disabled for

build.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@
3838
<property name="lib.dir" value="${basedir}/lib"/>
3939
<property name="conf.dir" value="${basedir}/conf"/>
4040
<property name="docs.dir" value="${basedir}/docs"/>
41+
<property name="cndocs.dir" value="${basedir}/docs/cn"/>
4142
<property name="contrib.dir" value="${basedir}/src/contrib"/>
4243
<property name="docs.src" value="${basedir}/src/docs"/>
44+
<property name="cndocs.src" value="${basedir}/src/docs/cn"/>
4345
<property name="changes.src" value="${docs.src}/changes"/>
4446
<property name="c++.src" value="${basedir}/src/c++"/>
4547
<property name="c++.utils.src" value="${c++.src}/utils"/>
@@ -221,6 +223,10 @@
221223
<exec executable="sh">
222224
<arg line="src/saveVersion.sh ${version}"/>
223225
</exec>
226+
227+
<exec executable="sh">
228+
<arg line="src/fixFontsPath.sh ${cndocs.src}"/>
229+
</exec>
224230
</target>
225231

226232
<!-- ====================================================== -->
@@ -694,6 +700,21 @@
694700
<style basedir="${conf.dir}" destdir="${docs.dir}"
695701
includes="hadoop-default.xml" style="conf/configuration.xsl"/>
696702
<antcall target="changes-to-html"/>
703+
<antcall target="cn-docs"/>
704+
</target>
705+
706+
<target name="cn-docs" depends="forrest.check, init"
707+
description="Generate forrest-based Chinese documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line."
708+
if="forrest.home">
709+
<exec dir="${cndocs.src}" executable="${forrest.home}/bin/forrest" failonerror="true">
710+
<env key="LANG" value="en_US.utf8"/>
711+
</exec>
712+
<copy todir="${cndocs.dir}">
713+
<fileset dir="${cndocs.src}/build/site/" />
714+
</copy>
715+
<style basedir="${conf.dir}" destdir="${cndocs.dir}"
716+
includes="hadoop-default.xml" style="conf/configuration.xsl"/>
717+
<antcall target="changes-to-html"/>
697718
</target>
698719

699720
<target name="forrest.check" unless="forrest.home">
@@ -892,6 +913,7 @@
892913
<target name="clean" depends="clean-contrib" description="Clean. Delete the build files, and their directories">
893914
<delete dir="${build.dir}"/>
894915
<delete dir="${docs.src}/build"/>
916+
<delete dir="${cndocs.src}/build"/>
895917
</target>
896918

897919
<!-- ================================================================== -->

docs/changes.html

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
function collapse() {
3737
for (var i = 0; i < document.getElementsByTagName("ul").length; i++) {
3838
var list = document.getElementsByTagName("ul")[i];
39-
if (list.id != 'release_0.17.2_-_2008-08-11_' && list.id != 'release_0.17.1_-_2008-06-23_') {
39+
if (list.id != 'release_0.17.3_-_unreleased_' && list.id != 'release_0.17.2_-_2008-08-11_') {
4040
list.style.display = "none";
4141
}
4242
}
@@ -52,6 +52,28 @@
5252
<a href="http://hadoop.apache.org/core/"><img class="logoImage" alt="Hadoop" src="images/hadoop-logo.jpg" title="Scalable Computing Platform"></a>
5353
<h1>Hadoop Change Log</h1>
5454

55+
<h2><a href="javascript:toggleList('release_0.17.3_-_unreleased_')">Release 0.17.3 - Unreleased
56+
</a></h2>
57+
<ul id="release_0.17.3_-_unreleased_">
58+
<li><a href="javascript:toggleList('release_0.17.3_-_unreleased_._improvements_')"> IMPROVEMENTS
59+
</a>&nbsp;&nbsp;&nbsp;(1)
60+
<ol id="release_0.17.3_-_unreleased_._improvements_">
61+
<li><a href="http://issues.apache.org/jira/browse/HADOOP-4164">HADOOP-4164</a>. Chinese translation of the documentation.<br />(Xuebing Yan via
62+
omalley)</li>
63+
</ol>
64+
</li>
65+
<li><a href="javascript:toggleList('release_0.17.3_-_unreleased_._bug_fixes_')"> BUG FIXES
66+
</a>&nbsp;&nbsp;&nbsp;(4)
67+
<ol id="release_0.17.3_-_unreleased_._bug_fixes_">
68+
<li><a href="http://issues.apache.org/jira/browse/HADOOP-4277">HADOOP-4277</a>. Checksum verification was mistakenly disabled for
69+
LocalFileSystem.<br />(Raghu Angadi)</li>
70+
<li><a href="http://issues.apache.org/jira/browse/HADOOP-4271">HADOOP-4271</a>. Checksum input stream can sometimes return invalid
71+
data to the user.<br />(Ning Li via rangadi)</li>
72+
<li><a href="http://issues.apache.org/jira/browse/HADOOP-4318">HADOOP-4318</a>. DistCp should use absolute paths for cleanup.<br />(szetszwo)</li>
73+
<li><a href="http://issues.apache.org/jira/browse/HADOOP-4326">HADOOP-4326</a>. ChecksumFileSystem does not override create(...) correctly.<br />(szetszwo)</li>
74+
</ol>
75+
</li>
76+
</ul>
5577
<h2><a href="javascript:toggleList('release_0.17.2_-_2008-08-11_')">Release 0.17.2 - 2008-08-11
5678
</a></h2>
5779
<ul id="release_0.17.2_-_2008-08-11_">
@@ -86,8 +108,10 @@ <h2><a href="javascript:toggleList('release_0.17.2_-_2008-08-11_')">Release 0.17
86108
</ol>
87109
</li>
88110
</ul>
89-
<h2><a href="javascript:toggleList('release_0.17.1_-_2008-06-23_')">Release 0.17.1 - 2008-06-23
90-
</a></h2>
111+
<h2><a href="javascript:toggleList('older')">Older Releases</a></h2>
112+
<ul id="older">
113+
<h3><a href="javascript:toggleList('release_0.17.1_-_2008-06-23_')">Release 0.17.1 - 2008-06-23
114+
</a></h3>
91115
<ul id="release_0.17.1_-_2008-06-23_">
92116
<li><a href="javascript:toggleList('release_0.17.1_-_2008-06-23_._incompatible_changes_')"> INCOMPATIBLE CHANGES
93117
</a>&nbsp;&nbsp;&nbsp;(1)
@@ -128,8 +152,6 @@ <h2><a href="javascript:toggleList('release_0.17.1_-_2008-06-23_')">Release 0.17
128152
</ol>
129153
</li>
130154
</ul>
131-
<h2><a href="javascript:toggleList('older')">Older Releases</a></h2>
132-
<ul id="older">
133155
<h3><a href="javascript:toggleList('release_0.17.0_-_2008-05-18_')">Release 0.17.0 - 2008-05-18
134156
</a></h3>
135157
<ul id="release_0.17.0_-_2008-05-18_">

docs/cn/broken-links.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<broken-links>
2+
</broken-links>

0 commit comments

Comments
 (0)