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.

Sign up for GitHub

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

fix: Line Chart Annotation Info Update #19001

Merged
merged 6 commits into from
Apr 14, 2022
Merged

fix: Line Chart Annotation Info Update #19001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71391f0
fix Line Chart Annotation Info Updage
codemaster08240328 Mar 2, 2022
f9913e8
wrap annotation text with transation
codemaster08240328 Mar 8, 2022
e2462fc
resolve comment
codemaster08240328 Mar 11, 2022
389eaf7
Merge branch 'master' into fix/line-chart-annotation
codemaster08240328 Mar 11, 2022
084486d
Merge branch 'master' into fix/line-chart-annotation
codemaster08240328 Mar 23, 2022
f164870
Merge branch 'master' into fix/line-chart-annotation
codemaster08240328 Apr 8, 2022
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
12 changes: 7 additions & 5 deletions superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,13 @@ export default class AnnotationLayer extends React.PureComponent {
description = 'Select the Annotation Layer you would like to use.';
} else {
label = t('Chart');
description = `Use a pre defined Superset Chart as a source for annotations and overlays.
your chart must be one of these visualization types:
[${this.getSupportedSourceTypes(annotationType)
.map(x => x.label)
.join(', ')}]`;
description = t(
`Use another existing chart as a source for annotations and overlays.
Your chart must be one of these visualization types: [%s]`,
this.getSupportedSourceTypes(annotationType)
.map(x => x.label)
.join(', '),
);
codemaster08240328 marked this conversation as resolved.
Show resolved Hide resolved
}
} else if (annotationType === ANNOTATION_TYPES.FORMULA) {
label = 'Formula';
Expand Down
4 changes: 2 additions & 2 deletions superset/translations/zh/LC_MESSAGES/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2824,8 +2824,8 @@
"Annotation Source": ["注释来源"],
"No options": ["没有选项"],
"Superset annotation": ["Superset注释"],
"Use a pre defined Superset Chart as a source for annotations and overlays. your chart must be one of these visualization types:": [
"使用预定义的图表作为注释和覆盖的源。图表必须是以下可视化类型之一："
"Use another existing chart as a source for annotations and overlays. Your chart must be one of these visualization types: [%s]": [
"使用预定义的图表作为注释和覆盖的源。图表必须是以下可视化类型之一： [%s]"
],
"Expects a formula with depending time parameter 'x'\n in milliseconds since epoch. mathjs is used to evaluate the formulas.\n Example: '2x+5'": [
"需要一个从Epoch（1970年1月1日00:00:00 UTC）时间点开始的时间参数“x”，并以此来计算的公式（以毫秒为单位）。我们使用“mathjs”来进行公式的计算。例如：'2x+5'"
Expand Down