Skip to content

Commit

Permalink
Merge pull request #424 from Qxx12/master
Browse files Browse the repository at this point in the history 
Fix English translations for various templates
  • Loading branch information
@plainheart
plainheart authored Oct 12, 2024
2 parents 2d4f557 + 013d402 commit d4fff84
Show file tree
Hide file tree
Showing 11 changed files with 121 additions and 122 deletions.
1 change: 0 additions & 1 deletion en/api/echarts-instance.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,6 @@ In cartesian (see [grid](option.html#grid)), convert a point to pixel coordinate
// xAxis-yAxis constitudes a cartesian.
// Perform conversion in the cartesian consist of the third xAxis and the yAxis with id 'y1'.
chart.convertToPixel({xAxisIndex: 2, yAxisId: 'y1'}, [300, 900]);
// 使用 id 为 'g1' 的 grid 的第一个 cartesian 进行转换：
// Perform conversion in the first cartesian of the grid with id 'g1'.
chart.convertToPixel({gridId: 'g1'}, [300, 900]);
```
Expand Down
16 changes: 8 additions & 8 deletions en/option-gl/component/globe.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The outer radius of the globe. This area between `globeRadius` and `globeOuterRa

{{ use: partial-environment(
componentType="globe",
componentName="地球"
componentName="globe"
) }}

{{ use: partial-environment }}
Expand Down Expand Up @@ -101,39 +101,39 @@ The following two images show the effects of different `displacementQuality`.

{{ use: partial-shading-globe(
componentType="globe",
componentName="地球"
componentName="globe"
) }}

{{ use: partial-light-globe(
componentType="globe",
componentName="地球"
componentName="globe"
) }}

{{ use: partial-atmosphere(
componentType="globe",
componentName="地球"
componentName="globe"
) }}

{{ use: partial-post-effect(
componentType="globe",
componentName="地球"
componentName="globe"
) }}

{{ use: partial-temporal-super-sampling(
componentType="globe",
componentName="地球"
componentName="globe"
) }}

{{ use: partial-view-control(
componentType="globe",
componentName="地球",
componentName="globe",
defaultPanSensitivity=0
) }}

### targetCoord(Array)

Position the longitudes and latitudes.
Ignore [alpha](~globe.viewControl.alpha) 和 [beta](~globe.viewControl.beta) after the setting.
Ignore [alpha](~globe.viewControl.alpha) and [beta](~globe.viewControl.beta) after the setting.


```ts
Expand Down
2 changes: 1 addition & 1 deletion en/option-gl/series/map3D.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Compared to 2D maps, 3D maps can set different heights for each area. This heigh
{{ use: component-geo3D-common(
componentType="series-map3D",
inMap=true,
componentName="三维地图"
componentName="3D map"
) }}
2 changes: 1 addition & 1 deletion en/option/partial/axisPointer-common.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ current value. When using [axisPointer.handle](xAxisPointer.handle), `value` can

<ExampleUIControlEnum options="show,hide" />

Current status, can be `'show'` 和 `'hide'`.
Current status, can be `'show'` or `'hide'`.

#${prefix} handle(Object)

Expand Down
6 changes: 3 additions & 3 deletions en/option/partial/zr-graphic.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1735,15 +1735,15 @@ We can also specify all of the properties like this:
###${prefix} duration(number)
动画时长，单位 ms
Duration of animation, unit: ms
###${prefix} easing(string)
动画缓动。不同的缓动效果可以参考 [缓动示例](${galleryEditorPath}line-easing)。
Easing effect. Refer to the following for different effects: [examples](${galleryEditorPath}line-easing)
###${prefix} delay(number)
动画延迟时长，单位 ms
Delay of animation, unit: ms
Expand Down
2 changes: 1 addition & 1 deletion en/option/series/lines.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ Label of a single line. Available when [polyline](~series-lines.polyline) is not

{{ use: partial-z-zlevel(
prefix = "#",
componentName = "路径图"
componentName = "lines graph"
) }}

{{ use: partial-silent(
Expand Down
204 changes: 102 additions & 102 deletions en/option/series/parallel.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,118 +7,118 @@ The series in parallel coordinate system.

{{ use: partial-parallel-introduce() }}

<ExampleBaseOption name="parallel-series" title="平行坐标" title-en="Parallel">
<ExampleBaseOption name="parallel-series" title="Parallel Series" title-en="Parallel">
const dataBJ = [
[1,55,9,56,0.46,18,6,"良"],
[2,25,11,21,0.65,34,9,"优"],
[3,56,7,63,0.3,14,5,"良"],
[4,33,7,29,0.33,16,6,"优"],
[5,42,24,44,0.76,40,16,"优"],
[6,82,58,90,1.77,68,33,"良"],
[7,74,49,77,1.46,48,27,"良"],
[8,78,55,80,1.29,59,29,"良"],
[9,267,216,280,4.8,108,64,"重度污染"],
[10,185,127,216,2.52,61,27,"中度污染"],
[11,39,19,38,0.57,31,15,"优"],
[12,41,11,40,0.43,21,7,"优"],
[13,64,38,74,1.04,46,22,"良"],
[14,108,79,120,1.7,75,41,"轻度污染"],
[15,108,63,116,1.48,44,26,"轻度污染"],
[16,33,6,29,0.34,13,5,"优"],
[17,94,66,110,1.54,62,31,"良"],
[18,186,142,192,3.88,93,79,"中度污染"],
[19,57,31,54,0.96,32,14,"良"],
[20,22,8,17,0.48,23,10,"优"],
[21,39,15,36,0.61,29,13,"优"],
[22,94,69,114,2.08,73,39,"良"],
[23,99,73,110,2.43,76,48,"良"],
[24,31,12,30,0.5,32,16,"优"],
[25,42,27,43,1,53,22,"优"],
[26,154,117,157,3.05,92,58,"中度污染"],
[27,234,185,230,4.09,123,69,"重度污染"],
[28,160,120,186,2.77,91,50,"中度污染"],
[29,134,96,165,2.76,83,41,"轻度污染"],
[30,52,24,60,1.03,50,21,"良"],
[31,46,5,49,0.28,10,6,"优"]
[1,55,9,56,0.46,18,6,"Moderate"],
[2,25,11,21,0.65,34,9,"Good"],
[3,56,7,63,0.3,14,5,"Moderate"],
[4,33,7,29,0.33,16,6,"Good"],
[5,42,24,44,0.76,40,16,"Good"],
[6,82,58,90,1.77,68,33,"Moderate"],
[7,74,49,77,1.46,48,27,"Moderate"],
[8,78,55,80,1.29,59,29,"Moderate"],
[9,267,216,280,4.8,108,64,"Very Unhealthy"],
[10,185,127,216,2.52,61,27,"Unhealthy"],
[11,39,19,38,0.57,31,15,"Good"],
[12,41,11,40,0.43,21,7,"Good"],
[13,64,38,74,1.04,46,22,"Moderate"],
[14,108,79,120,1.7,75,41,"Unhealthy for Sensitive Groups"],
[15,108,63,116,1.48,44,26,"Unhealthy for Sensitive Groups"],
[16,33,6,29,0.34,13,5,"Good"],
[17,94,66,110,1.54,62,31,"Moderate"],
[18,186,142,192,3.88,93,79,"Unhealthy"],
[19,57,31,54,0.96,32,14,"Moderate"],
[20,22,8,17,0.48,23,10,"Good"],
[21,39,15,36,0.61,29,13,"Good"],
[22,94,69,114,2.08,73,39,"Moderate"],
[23,99,73,110,2.43,76,48,"Moderate"],
[24,31,12,30,0.5,32,16,"Good"],
[25,42,27,43,1,53,22,"Good"],
[26,154,117,157,3.05,92,58,"Unhealthy"],
[27,234,185,230,4.09,123,69,"Very Unhealthy"],
[28,160,120,186,2.77,91,50,"Unhealthy"],
[29,134,96,165,2.76,83,41,"Unhealthy for Sensitive Groups"],
[30,52,24,60,1.03,50,21,"Moderate"],
[31,46,5,49,0.28,10,6,"Good"]
];

const dataGZ = [
[1,26,37,27,1.163,27,13,"优"],
[2,85,62,71,1.195,60,8,"良"],
[3,78,38,74,1.363,37,7,"良"],
[4,21,21,36,0.634,40,9,"优"],
[5,41,42,46,0.915,81,13,"优"],
[6,56,52,69,1.067,92,16,"良"],
[7,64,30,28,0.924,51,2,"良"],
[8,55,48,74,1.236,75,26,"良"],
[9,76,85,113,1.237,114,27,"良"],
[10,91,81,104,1.041,56,40,"良"],
[11,84,39,60,0.964,25,11,"良"],
[12,64,51,101,0.862,58,23,"良"],
[13,70,69,120,1.198,65,36,"良"],
[14,77,105,178,2.549,64,16,"良"],
[15,109,68,87,0.996,74,29,"轻度污染"],
[16,73,68,97,0.905,51,34,"良"],
[17,54,27,47,0.592,53,12,"良"],
[18,51,61,97,0.811,65,19,"良"],
[19,91,71,121,1.374,43,18,"良"],
[20,73,102,182,2.787,44,19,"良"],
[21,73,50,76,0.717,31,20,"良"],
[22,84,94,140,2.238,68,18,"良"],
[23,93,77,104,1.165,53,7,"良"],
[24,99,130,227,3.97,55,15,"良"],
[25,146,84,139,1.094,40,17,"轻度污染"],
[26,113,108,137,1.481,48,15,"轻度污染"],
[27,81,48,62,1.619,26,3,"良"],
[28,56,48,68,1.336,37,9,"良"],
[29,82,92,174,3.29,0,13,"良"],
[30,106,116,188,3.628,101,16,"轻度污染"],
[31,118,50,0,1.383,76,11,"轻度污染"]
[1,26,37,27,1.163,27,13,"Good"],
[2,85,62,71,1.195,60,8,"Moderate"],
[3,78,38,74,1.363,37,7,"Moderate"],
[4,21,21,36,0.634,40,9,"Good"],
[5,41,42,46,0.915,81,13,"Good"],
[6,56,52,69,1.067,92,16,"Moderate"],
[7,64,30,28,0.924,51,2,"Moderate"],
[8,55,48,74,1.236,75,26,"Moderate"],
[9,76,85,113,1.237,114,27,"Moderate"],
[10,91,81,104,1.041,56,40,"Moderate"],
[11,84,39,60,0.964,25,11,"Moderate"],
[12,64,51,101,0.862,58,23,"Moderate"],
[13,70,69,120,1.198,65,36,"Moderate"],
[14,77,105,178,2.549,64,16,"Moderate"],
[15,109,68,87,0.996,74,29,"Unhealthy for Sensitive Groups"],
[16,73,68,97,0.905,51,34,"Moderate"],
[17,54,27,47,0.592,53,12,"Moderate"],
[18,51,61,97,0.811,65,19,"Moderate"],
[19,91,71,121,1.374,43,18,"Moderate"],
[20,73,102,182,2.787,44,19,"Moderate"],
[21,73,50,76,0.717,31,20,"Moderate"],
[22,84,94,140,2.238,68,18,"Moderate"],
[23,93,77,104,1.165,53,7,"Moderate"],
[24,99,130,227,3.97,55,15,"Moderate"],
[25,146,84,139,1.094,40,17,"Unhealthy for Sensitive Groups"],
[26,113,108,137,1.481,48,15,"Unhealthy for Sensitive Groups"],
[27,81,48,62,1.619,26,3,"Moderate"],
[28,56,48,68,1.336,37,9,"Moderate"],
[29,82,92,174,3.29,0,13,"Moderate"],
[30,106,116,188,3.628,101,16,"Unhealthy for Sensitive Groups"],
[31,118,50,0,1.383,76,11,"Unhealthy for Sensitive Groups"]
];

const dataSH = [
[1,91,45,125,0.82,34,23,"良"],
[2,65,27,78,0.86,45,29,"良"],
[3,83,60,84,1.09,73,27,"良"],
[4,109,81,121,1.28,68,51,"轻度污染"],
[5,106,77,114,1.07,55,51,"轻度污染"],
[6,109,81,121,1.28,68,51,"轻度污染"],
[7,106,77,114,1.07,55,51,"轻度污染"],
[8,89,65,78,0.86,51,26,"良"],
[9,53,33,47,0.64,50,17,"良"],
[10,80,55,80,1.01,75,24,"良"],
[11,117,81,124,1.03,45,24,"轻度污染"],
[12,99,71,142,1.1,62,42,"良"],
[13,95,69,130,1.28,74,50,"良"],
[14,116,87,131,1.47,84,40,"轻度污染"],
[15,108,80,121,1.3,85,37,"轻度污染"],
[16,134,83,167,1.16,57,43,"轻度污染"],
[17,79,43,107,1.05,59,37,"良"],
[18,71,46,89,0.86,64,25,"良"],
[19,97,71,113,1.17,88,31,"良"],
[20,84,57,91,0.85,55,31,"良"],
[21,87,63,101,0.9,56,41,"良"],
[22,104,77,119,1.09,73,48,"轻度污染"],
[23,87,62,100,1,72,28,"良"],
[24,168,128,172,1.49,97,56,"中度污染"],
[25,65,45,51,0.74,39,17,"良"],
[26,39,24,38,0.61,47,17,"优"],
[27,39,24,39,0.59,50,19,"优"],
[28,93,68,96,1.05,79,29,"良"],
[29,188,143,197,1.66,99,51,"中度污染"],
[30,174,131,174,1.55,108,50,"中度污染"],
[31,187,143,201,1.39,89,53,"中度污染"]
[1,91,45,125,0.82,34,23,"Moderate"],
[2,65,27,78,0.86,45,29,"Moderate"],
[3,83,60,84,1.09,73,27,"Moderate"],
[4,109,81,121,1.28,68,51,"Unhealthy for Sensitive Groups"],
[5,106,77,114,1.07,55,51,"Unhealthy for Sensitive Groups"],
[6,109,81,121,1.28,68,51,"Unhealthy for Sensitive Groups"],
[7,106,77,114,1.07,55,51,"Unhealthy for Sensitive Groups"],
[8,89,65,78,0.86,51,26,"Moderate"],
[9,53,33,47,0.64,50,17,"Moderate"],
[10,80,55,80,1.01,75,24,"Moderate"],
[11,117,81,124,1.03,45,24,"Unhealthy for Sensitive Groups"],
[12,99,71,142,1.1,62,42,"Moderate"],
[13,95,69,130,1.28,74,50,"Moderate"],
[14,116,87,131,1.47,84,40,"Unhealthy for Sensitive Groups"],
[15,108,80,121,1.3,85,37,"Unhealthy for Sensitive Groups"],
[16,134,83,167,1.16,57,43,"Unhealthy for Sensitive Groups"],
[17,79,43,107,1.05,59,37,"Moderate"],
[18,71,46,89,0.86,64,25,"Moderate"],
[19,97,71,113,1.17,88,31,"Moderate"],
[20,84,57,91,0.85,55,31,"Moderate"],
[21,87,63,101,0.9,56,41,"Moderate"],
[22,104,77,119,1.09,73,48,"Unhealthy for Sensitive Groups"],
[23,87,62,100,1,72,28,"Moderate"],
[24,168,128,172,1.49,97,56,"Unhealthy"],
[25,65,45,51,0.74,39,17,"Moderate"],
[26,39,24,38,0.61,47,17,"Good"],
[27,39,24,39,0.59,50,19,"Good"],
[28,93,68,96,1.05,79,29,"Moderate"],
[29,188,143,197,1.66,99,51,"Unhealthy"],
[30,174,131,174,1.55,108,50,"Unhealthy"],
[31,187,143,201,1.39,89,53,"Unhealthy"]
];

const schema = [
{name: 'date', index: 0, text: '日期'},
{name: 'date', index: 0, text: 'Date'},
{name: 'AQIindex', index: 1, text: 'AQI'},
{name: 'PM25', index: 2, text: 'PM2.5'},
{name: 'PM10', index: 3, text: 'PM10'},
{name: 'CO', index: 4, text: ' CO'},
{name: 'NO2', index: 5, text: 'NO2'},
{name: 'SO2', index: 6, text: 'SO2'},
{name: '等级', index: 7, text: '等级'}
{name: 'level', index: 7, text: 'Level'}
];

const option = {
Expand All @@ -127,7 +127,7 @@ const option = {
],
legend: {
top: 10,
data: ['北京', '上海', '广州'],
data: ['Beijing', 'Shanghai', 'Guangzhou'],
itemGap: 20
},
parallelAxis: [
Expand All @@ -139,7 +139,7 @@ const option = {
{dim: 5, name: schema[5].text},
{dim: 6, name: schema[6].text},
{dim: 7, name: schema[7].text,
type: 'category', data: ['优', '良', '轻度污染', '中度污染', '重度污染', '严重污染']}
type: 'category', data: ['Good', 'Moderate', 'Unhealthy for Sensitive Groups', 'Unhealthy', 'Very Unhealthy', 'Hazardous']}
],
parallel: {
left: '5%',
Expand All @@ -148,7 +148,7 @@ const option = {
top: '20%',
parallelAxisDefault: {
type: 'value',
name: 'AQI指数',
name: 'AQI Index',
nameLocation: 'end',
nameGap: 20,
nameTextStyle: {
Expand All @@ -158,17 +158,17 @@ const option = {
},
series: [
{
name: '北京',
name: 'Beijing',
type: 'parallel',
data: dataBJ
},
{
name: '上海',
name: 'Shanghai',
type: 'parallel',
data: dataSH
},
{
name: '广州',
name: 'Guangzhou',
type: 'parallel',
data: dataGZ
}
Expand Down
2 changes: 1 addition & 1 deletion en/option/series/tree.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ The curvature of the tree edge.

#${prefix} itemStyle(Object)

该节点的样式。
The style of this node.

{{ use: partial-item-style(
prefix = "#" + ${prefix},
Expand Down
2 changes: 1 addition & 1 deletion en/tutorial/drag-example.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is a tiny example, introducing how to implement dragging of graphic element

~[600x400](${galleryViewPath}line-draggable&edit=1&reset=1)

This example mainly implements that dragging points of a curve and by which the curve is modified. Although it is simple example, but we can do more based on that, like edit charts viually. So let's get started from this simple example.
This example mainly implements that dragging points of a curve and by which the curve is modified. Although it is a simple example, we can do more based on that, like editing charts visually. So let's get started.



Expand Down
2 changes: 1 addition & 1 deletion en/tutorial/rich-text.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ label: {
}
```

> Notice: `width` 和 `height` only work when `rich` specified.
> Notice: `width` and `height` only work when `rich` specified.

## Basic Styles of Text, Text Block and Text Fragment
Expand Down
Loading

0 comments on commit d4fff84

Please sign in to comment.