Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files Browse the repository at this point in the history
* 'master' of https://github.com/apache/incubator-echarts:
  Update langEN.js
  Improve based on revision
  Fix grammar
  Add aria defaults for lang-en
  Tweak the "is string" check.
  Check if dataDims[0] type is number or not
  Fix negetive number or string exist in dimensions array, the corresponding line won't show (#10343)
100pah committed May 7, 2019
2 parents e5e072a + bc53d74 commit edcdfa5
Showing 2 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/data/helper/completeDimensions.js
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ function completeDimensions(sysDims, source, opt) {
// Note: It is allowed that `dataDims.length` is `0`, e.g., options is
// `{encode: {x: -1, y: 1}}`. Should not filter anything in
// this case.
if (dataDims.length === 1 && dataDims[0] < 0) {
if (dataDims.length === 1 && !isString(dataDims[0]) && dataDims[0] < 0) {
encodeDef.set(coordDim, false);
return;
}
32 changes: 32 additions & 0 deletions src/langEN.js
Original file line number Diff line number Diff line change
@@ -55,5 +55,37 @@ export default {
title: 'Save as Image',
lang: ['Right Click to Save Image']
}
},
aria: {
general: {
withTitle: 'This is a chart about "{title}"',
withoutTitle: 'This is a chart'
},
series: {
single: {
prefix: '',
withName: ' with type {seriesType} named {seriesName}.',
withoutName: ' with type {seriesType}.'
},
multiple: {
prefix: '. It consists of {seriesCount} series count.',
withName: ' The {seriesId} series is a {seriesType} representing {seriesName}.',
withoutName: ' The {seriesId} series is a {seriesType}.',
separator: {
middle: '',
end: ''
}
}
},
data: {
allData: 'The data is as follows: ',
partialData: 'The first {displayCnt} items are: ',
withName: 'the data for {name} is {value}',
withoutName: '{value}',
separator: {
middle: ',',
end: '.'
}
}
}
};

0 comments on commit edcdfa5

Please sign in to comment.