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: change legend type description to fit SV (DHIS2-15120) #2757

Merged
merged 4 commits into from
Oct 2, 2023
Merged

fix: change legend type description to fit SV (DHIS2-15120) #2757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d1e489
fix: change labels for legend options
martinkrulltott Sep 6, 2023
9407882
Merge branch 'dev' into fix/DHIS2-15120-legend-text
martinkrulltott Sep 12, 2023
1ebb53c
Merge branch 'dev' into fix/DHIS2-15120-legend-text
martinkrulltott Sep 28, 2023
3f811b4
test: update strings in cypress
martinkrulltott Oct 2, 2023
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
7 changes: 2 additions & 5 deletions cypress/elements/optionsModal/legend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,12 @@ export const toggleLegend = () =>
.click()

export const changeDisplayStrategyToFixed = () =>
cy
.getBySel(optionsModalContentEl)
.contains('Select a single legend for the entire visualization')
.click()
cy.getBySel(optionsModalContentEl).contains('Select a legend').click()

export const changeDisplayStrategyToByDataItem = () =>
cy
.getBySel(optionsModalContentEl)
.contains('Use pre-defined legend per data item')
.contains('Use pre-defined legend by data item')
.click()

export const changeDisplayStyleToText = () =>
Expand Down
12 changes: 6 additions & 6 deletions i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2023-05-30T12:32:59.044Z\n"
"PO-Revision-Date: 2023-05-30T12:32:59.044Z\n"
"POT-Creation-Date: 2023-09-06T13:41:14.540Z\n"
"PO-Revision-Date: 2023-09-06T13:41:14.540Z\n"

msgid "All items"
msgstr "All items"
Expand Down Expand Up @@ -480,11 +480,11 @@ msgstr "Legend style"
msgid "Legend type"
msgstr "Legend type"

msgid "Use pre-defined legend per data item"
msgstr "Use pre-defined legend per data item"
msgid "Use pre-defined legend by data item"
msgstr "Use pre-defined legend by data item"

msgid "Select a single legend for the entire visualization"
msgstr "Select a single legend for the entire visualization"
msgid "Select a legend"
msgstr "Select a legend"

msgid "Legend changes background color"
msgstr "Legend changes background color"
Expand Down
6 changes: 2 additions & 4 deletions src/components/VisualizationOptions/Options/LegendDisplayStrategy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const LegendDisplayStrategy = ({ value, onChange }) => (
<Field name={OPTION_LEGEND_DISPLAY_STRATEGY} dense>
<Radio
key={LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM}
label={i18n.t('Use pre-defined legend per data item')}
label={i18n.t('Use pre-defined legend by data item')}
value={LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM}
checked={value === LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM}
onChange={onChange}
Expand All @@ -27,9 +27,7 @@ const LegendDisplayStrategy = ({ value, onChange }) => (
/>
<Radio
key={LEGEND_DISPLAY_STRATEGY_FIXED}
label={i18n.t(
'Select a single legend for the entire visualization'
)}
label={i18n.t('Select a legend')}
value={LEGEND_DISPLAY_STRATEGY_FIXED}
checked={value === LEGEND_DISPLAY_STRATEGY_FIXED}
onChange={onChange}
Expand Down
Loading