Commit 78150472 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'ee-js-i18n-burndown-chart' into 'master'

i18n EE JS burndown chart

See merge request gitlab-org/gitlab-ee!14066
parents ea523610 ff1d8811
...@@ -4,7 +4,7 @@ import BurndownChart from './burndown_chart'; ...@@ -4,7 +4,7 @@ import BurndownChart from './burndown_chart';
import BurndownChartData from './burndown_chart_data'; import BurndownChartData from './burndown_chart_data';
import Flash from '~/flash'; import Flash from '~/flash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { s__ } from '~/locale'; import { s__, __ } from '~/locale';
export default () => { export default () => {
// handle hint dismissal // handle hint dismissal
...@@ -71,6 +71,6 @@ export default () => { ...@@ -71,6 +71,6 @@ export default () => {
window.addEventListener('resize', () => chart.animateResize(1)); window.addEventListener('resize', () => chart.animateResize(1));
$(document).on('click', '.js-sidebar-toggle', () => chart.animateResize(2)); $(document).on('click', '.js-sidebar-toggle', () => chart.animateResize(2));
}) })
.catch(() => new Flash('Error loading burndown chart data')); .catch(() => new Flash(__('Error loading burndown chart data')));
} }
}; };
...@@ -5043,6 +5043,9 @@ msgstr "" ...@@ -5043,6 +5043,9 @@ msgstr ""
msgid "Error loading branches." msgid "Error loading branches."
msgstr "" msgstr ""
msgid "Error loading burndown chart data"
msgstr ""
msgid "Error loading file viewer." msgid "Error loading file viewer."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment