From dc5745235be19e598c6436b36595035e01399f1f Mon Sep 17 00:00:00 2001
From: Pierre Ecarlat <pecarlat@grandlyon.com>
Date: Fri, 30 Aug 2024 07:22:27 +0000
Subject: [PATCH] fix(a11y): Add label and description to buttons
---
.../ProfileComparator/ProfileComparator.tsx | 1 -
.../__snapshots__/ProfileComparator.spec.tsx.snap | 1 -
.../Challenge/ChallengeCard/ChallengeCard.tsx | 4 ++++
.../__snapshots__/ChallengeCard.spec.tsx.snap | 3 +--
.../ChallengeCardDone/ChallengeCardDone.spec.tsx | 12 +++++++++---
.../ChallengeCardDone/ChallengeCardDone.tsx | 7 +------
.../__snapshots__/ChallengeCardDone.spec.tsx.snap | 2 --
.../ChallengeCardLast/ChallengeCardLast.tsx | 6 +-----
.../__snapshots__/ChallengeCardLast.spec.tsx.snap | 1 -
src/components/Connection/EPGLConnect/EpglForm.tsx | 7 ++++++-
.../ConsumptionVisualizer/NoDataModal.tsx | 6 +-----
.../__snapshots__/NoDataModal.spec.tsx.snap | 1 -
.../EcogestureEmptyList.spec.tsx | 8 ++++++--
.../EcogestureEmptyList/EcogestureEmptyList.tsx | 13 ++-----------
.../__snapshots__/EcogestureEmptyList.spec.tsx.snap | 2 --
.../EcogestureNotFound/EcogestureNotFound.tsx | 1 -
.../__snapshots__/EcogestureNotFound.spec.tsx.snap | 1 -
.../EcogestureResetModal/EcogestureResetModal.tsx | 12 ++----------
.../EcogestureResetModal.spec.tsx.snap | 2 --
.../__snapshots__/EcogestureTabsView.spec.tsx.snap | 4 ----
.../EcogestureSelectionDetail.tsx | 3 ---
.../EcogestureSelectionDetail.spec.tsx.snap | 3 ---
.../EcogestureSelectionModal.tsx | 8 ++------
.../EcogestureSelectionModal.spec.tsx.snap | 1 -
src/components/Exploration/ExplorationOngoing.tsx | 2 +-
src/components/Feedback/FeedbackModal.tsx | 12 ++----------
.../__snapshots__/FeedbackModal.spec.tsx.snap | 2 --
.../__snapshots__/exportLoadingModal.spec.tsx.snap | 1 -
.../__snapshots__/exportStartModal.spec.tsx.snap | 2 --
.../ExportData/Modals/exportLoadingModal.tsx | 6 +-----
.../Options/ExportData/Modals/exportStartModal.tsx | 12 ++----------
src/components/Terms/TermsView.tsx | 6 +-----
src/locales/fr.json | 4 +++-
33 files changed, 45 insertions(+), 111 deletions(-)
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
index aced331fa..288be905f 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
@@ -133,7 +133,6 @@ const ProfileComparator = ({
{t('analysis.approximative_description')}
</div>
<Button
- aria-label={t('analysis.accessibility.button_go_to_profil')}
onClick={() => navigate('/profileType')}
classes={{
root: 'btnPrimary',
diff --git a/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap b/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap
index ec5c29db9..40897d20f 100644
--- a/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap
+++ b/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap
@@ -32,7 +32,6 @@ exports[`AnalysisConsumption component should be rendered correctly with profile
analysis.approximative_description
</div>
<button
- aria-label="analysis.accessibility.button_go_to_profil"
class="MuiButtonBase-root MuiButton-root btnPrimary MuiButton-text MuiButton-textSizeLarge MuiButton-sizeLarge"
data-testid="goToProfile"
tabindex="0"
diff --git a/src/components/Challenge/ChallengeCard/ChallengeCard.tsx b/src/components/Challenge/ChallengeCard/ChallengeCard.tsx
index 12673d7f6..e68175ff6 100644
--- a/src/components/Challenge/ChallengeCard/ChallengeCard.tsx
+++ b/src/components/Challenge/ChallengeCard/ChallengeCard.tsx
@@ -1,3 +1,4 @@
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { UserChallengeState } from 'enums'
import { UserChallenge } from 'models'
import React from 'react'
@@ -25,6 +26,8 @@ const ChallengeCard = ({
cardHeight,
moveToSlide,
}: ChallengeCardProps) => {
+ const { t } = useI18n()
+
const renderCard = (userChallenge: UserChallenge | undefined) => {
switch (userChallenge?.state) {
case UserChallengeState.LOCKED:
@@ -43,6 +46,7 @@ const ChallengeCard = ({
return (
<button
+ aria-label={t('challenge.card.goto')}
onClick={() => moveToSlide(index)}
className={indexSlider === index ? 'slide active' : 'slide inactive'}
style={{
diff --git a/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap b/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap
index 9631c07ba..bdba35831 100644
--- a/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap
+++ b/src/components/Challenge/ChallengeCard/__snapshots__/ChallengeCard.spec.tsx.snap
@@ -3,6 +3,7 @@
exports[`ChallengeCard component should be rendered correctly 1`] = `
<div>
<button
+ aria-label="challenge.card.goto"
class="slide active"
style="min-width: 200px; max-width: 200px; min-height: 400px; background: none; padding: 0px;"
>
@@ -55,7 +56,6 @@ RUISSEAU
class="buttons"
>
<button
- aria-label="challenge.card_done.final_defi_view"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
@@ -70,7 +70,6 @@ RUISSEAU
/>
</button>
<button
- aria-label="challenge.card_done.reset_defi"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimaryNegative"
tabindex="0"
type="button"
diff --git a/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.spec.tsx b/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.spec.tsx
index d62b47d36..ec7e95110 100644
--- a/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.spec.tsx
+++ b/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.spec.tsx
@@ -65,7 +65,9 @@ describe('ChallengeCardDone component', () => {
<ChallengeCardDone userChallenge={userChallengeData[0]} />
</Provider>
)
- const resetBtn = screen.getByLabelText('challenge.card_done.reset_defi')
+ const resetBtn = screen.getByRole('button', {
+ name: 'challenge.card_done.reset_defi',
+ })
expect(resetBtn).toHaveProperty('disabled')
expect(mockDispatch).toHaveBeenCalledTimes(0)
expect(mockUpdateUserChallenge).toHaveBeenCalledTimes(0)
@@ -76,7 +78,9 @@ describe('ChallengeCardDone component', () => {
<ChallengeCardDone userChallenge={userChallengeData[1]} />
</Provider>
)
- const resetBtn = screen.getByLabelText('challenge.card_done.reset_defi')
+ const resetBtn = screen.getByRole('button', {
+ name: 'challenge.card_done.reset_defi',
+ })
expect(resetBtn).toHaveClass('btnPrimaryNegative')
})
it('should be secondary button is challenge is won', async () => {
@@ -85,7 +89,9 @@ describe('ChallengeCardDone component', () => {
<ChallengeCardDone userChallenge={userChallengeData[0]} />
</Provider>
)
- const resetBtn = screen.getByLabelText('challenge.card_done.reset_defi')
+ const resetBtn = screen.getByRole('button', {
+ name: 'challenge.card_done.reset_defi',
+ })
expect(resetBtn).toHaveClass('btnSecondary')
})
})
diff --git a/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.tsx b/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.tsx
index ec66ecbaa..f671152a3 100644
--- a/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.tsx
+++ b/src/components/Challenge/ChallengeCardDone/ChallengeCardDone.tsx
@@ -115,15 +115,10 @@ const ChallengeCardDone = ({
</span>
</div>
<div className="buttons">
- <Button
- aria-label={t('challenge.card_done.final_defi_view')}
- onClick={goDuel}
- className="btnSecondary"
- >
+ <Button onClick={goDuel} className="btnSecondary">
{t('challenge.card_done.final_defi_view')}
</Button>
<Button
- aria-label={t('challenge.card_done.reset_defi')}
onClick={handleChallengeReset}
className={
userChallenge.success === UserChallengeSuccess.WIN
diff --git a/src/components/Challenge/ChallengeCardDone/__snapshots__/ChallengeCardDone.spec.tsx.snap b/src/components/Challenge/ChallengeCardDone/__snapshots__/ChallengeCardDone.spec.tsx.snap
index 7df066b7f..8e652c9da 100644
--- a/src/components/Challenge/ChallengeCardDone/__snapshots__/ChallengeCardDone.spec.tsx.snap
+++ b/src/components/Challenge/ChallengeCardDone/__snapshots__/ChallengeCardDone.spec.tsx.snap
@@ -51,7 +51,6 @@ VEILLE
class="buttons"
>
<button
- aria-label="challenge.card_done.final_defi_view"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
@@ -66,7 +65,6 @@ VEILLE
/>
</button>
<button
- aria-label="challenge.card_done.reset_defi"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
diff --git a/src/components/Challenge/ChallengeCardLast/ChallengeCardLast.tsx b/src/components/Challenge/ChallengeCardLast/ChallengeCardLast.tsx
index 2fef4046d..a4eaf33c5 100644
--- a/src/components/Challenge/ChallengeCardLast/ChallengeCardLast.tsx
+++ b/src/components/Challenge/ChallengeCardLast/ChallengeCardLast.tsx
@@ -23,11 +23,7 @@ const ChallengeCardLast = () => {
<StyledIcon icon={ecolyoIcon} size={62} />
<div className="text-22-bold">{t('challenge.card_last.title')}</div>
<div className="text-18-normal">{t('challenge.card_last.message1')}</div>
- <Button
- aria-label={t('challenge.card_last.button')}
- onClick={handleClickFeedbacks}
- className="btnSecondary"
- >
+ <Button onClick={handleClickFeedbacks} className="btnSecondary">
{t('challenge.card_last.button')}
</Button>
</div>
diff --git a/src/components/Challenge/ChallengeCardLast/__snapshots__/ChallengeCardLast.spec.tsx.snap b/src/components/Challenge/ChallengeCardLast/__snapshots__/ChallengeCardLast.spec.tsx.snap
index 7d3662420..7100f0f0f 100644
--- a/src/components/Challenge/ChallengeCardLast/__snapshots__/ChallengeCardLast.spec.tsx.snap
+++ b/src/components/Challenge/ChallengeCardLast/__snapshots__/ChallengeCardLast.spec.tsx.snap
@@ -26,7 +26,6 @@ exports[`ChallengeCardLast component should be rendered correctly 1`] = `
challenge.card_last.message1
</div>
<button
- aria-label="challenge.card_last.button"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
diff --git a/src/components/Connection/EPGLConnect/EpglForm.tsx b/src/components/Connection/EPGLConnect/EpglForm.tsx
index 14ba3dd2c..db922973f 100644
--- a/src/components/Connection/EPGLConnect/EpglForm.tsx
+++ b/src/components/Connection/EPGLConnect/EpglForm.tsx
@@ -121,7 +121,12 @@ const EpglForm = ({ hasCreatedAccount }: { hasCreatedAccount: boolean }) => {
<span>
<StyledIconButton
icon={TrailingIcon}
- aria-label={t('auth.accessibility.button_reveal_password')}
+ aria-label={
+ showPassword
+ ? t('auth.accessibility.button_hide_password')
+ : t('auth.accessibility.button_reveal_password')
+ }
+ aria-checked={showPassword}
className="iconShowPassword"
sized={22}
onClick={() => setShowPassword(prev => !prev)}
diff --git a/src/components/ConsumptionVisualizer/NoDataModal.tsx b/src/components/ConsumptionVisualizer/NoDataModal.tsx
index 18f23c2cc..b930837d7 100644
--- a/src/components/ConsumptionVisualizer/NoDataModal.tsx
+++ b/src/components/ConsumptionVisualizer/NoDataModal.tsx
@@ -52,11 +52,7 @@ const NoDataModal = ({ open, handleCloseClick }: NoDataModalProps) => {
<li>{t('consumption_visualizer.dataModal.item3')}</li>
<li>{t('consumption_visualizer.dataModal.item4')}</li>
</ul>
- <Button
- aria-label={t('ecogesture_info_modal.button_close')}
- onClick={handleCloseClick}
- className="btnPrimary"
- >
+ <Button onClick={handleCloseClick} className="btnPrimary">
{t('ecogesture_info_modal.button_close')}
</Button>
</div>
diff --git a/src/components/ConsumptionVisualizer/__snapshots__/NoDataModal.spec.tsx.snap b/src/components/ConsumptionVisualizer/__snapshots__/NoDataModal.spec.tsx.snap
index 0e55d2ee5..a15d8b061 100644
--- a/src/components/ConsumptionVisualizer/__snapshots__/NoDataModal.spec.tsx.snap
+++ b/src/components/ConsumptionVisualizer/__snapshots__/NoDataModal.spec.tsx.snap
@@ -103,7 +103,6 @@ exports[`NoDataModal component should render correctly 1`] = `
</li>
</ul>
<button
- aria-label="ecogesture_info_modal.button_close"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
diff --git a/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.spec.tsx b/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.spec.tsx
index bb80e51c2..20f5c94c9 100644
--- a/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.spec.tsx
+++ b/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.spec.tsx
@@ -32,7 +32,9 @@ describe('EcogestureEmptyList component', () => {
/>
)
await act(async () => {
- await userEvent.click(screen.getByLabelText('ecogesture.emptyList.btn1'))
+ await userEvent.click(
+ screen.getByRole('button', { name: 'ecogesture.emptyList.btn1' })
+ )
})
expect(mockChangeTab).toHaveBeenCalledTimes(1)
})
@@ -46,7 +48,9 @@ describe('EcogestureEmptyList component', () => {
/>
)
await act(async () => {
- await userEvent.click(screen.getByLabelText('ecogesture.emptyList.btn2'))
+ await userEvent.click(
+ screen.getByRole('button', { name: 'ecogesture.emptyList.btn2' })
+ )
})
expect(mockedNavigate).toHaveBeenCalledWith('/ecogesture-form')
})
diff --git a/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.tsx b/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.tsx
index 67fded06b..2e4253591 100644
--- a/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.tsx
+++ b/src/components/Ecogesture/EcogestureEmptyList/EcogestureEmptyList.tsx
@@ -38,27 +38,18 @@ const EcogestureEmptyList = ({
{t(`ecogesture.emptyList.${objOrDoing}2${isDone}`)}
</div>
<div className="buttons">
- <Button
- aria-label={t('ecogesture.emptyList.btn1')}
- onClick={() => setTab(2)}
- className="btnSecondary"
- >
+ <Button onClick={() => setTab(2)} className="btnSecondary">
{t('ecogesture.emptyList.btn1')}
</Button>
{isSelectionDone && (
- <Button
- aria-label={t('ecogesture.reset')}
- onClick={openResetEcogestureModal}
- className="btnSecondary"
- >
+ <Button onClick={openResetEcogestureModal} className="btnSecondary">
{t('ecogesture.reset')}
</Button>
)}
{!isSelectionDone && (
<Button
- aria-label={t('ecogesture.emptyList.btn2')}
onClick={() => {
navigate('/ecogesture-form')
}}
diff --git a/src/components/Ecogesture/EcogestureEmptyList/__snapshots__/EcogestureEmptyList.spec.tsx.snap b/src/components/Ecogesture/EcogestureEmptyList/__snapshots__/EcogestureEmptyList.spec.tsx.snap
index 3fcc1897f..e3f1bf13d 100644
--- a/src/components/Ecogesture/EcogestureEmptyList/__snapshots__/EcogestureEmptyList.spec.tsx.snap
+++ b/src/components/Ecogesture/EcogestureEmptyList/__snapshots__/EcogestureEmptyList.spec.tsx.snap
@@ -32,7 +32,6 @@ exports[`EcogestureEmptyList component should be rendered correctly 1`] = `
class="buttons"
>
<button
- aria-label="ecogesture.emptyList.btn1"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
@@ -47,7 +46,6 @@ exports[`EcogestureEmptyList component should be rendered correctly 1`] = `
/>
</button>
<button
- aria-label="ecogesture.emptyList.btn2"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
diff --git a/src/components/Ecogesture/EcogestureNotFound/EcogestureNotFound.tsx b/src/components/Ecogesture/EcogestureNotFound/EcogestureNotFound.tsx
index c4bf64361..4f2b5cd15 100644
--- a/src/components/Ecogesture/EcogestureNotFound/EcogestureNotFound.tsx
+++ b/src/components/Ecogesture/EcogestureNotFound/EcogestureNotFound.tsx
@@ -29,7 +29,6 @@ const EcogestureNotFound = ({
<div className="text-18-bold head">{text}</div>
<Button
- aria-label={t('error_page.back')}
onClick={() => navigate(`/${returnPage}`)}
className="btnPrimary"
>
diff --git a/src/components/Ecogesture/EcogestureNotFound/__snapshots__/EcogestureNotFound.spec.tsx.snap b/src/components/Ecogesture/EcogestureNotFound/__snapshots__/EcogestureNotFound.spec.tsx.snap
index c6390dcbd..bc2f4b297 100644
--- a/src/components/Ecogesture/EcogestureNotFound/__snapshots__/EcogestureNotFound.spec.tsx.snap
+++ b/src/components/Ecogesture/EcogestureNotFound/__snapshots__/EcogestureNotFound.spec.tsx.snap
@@ -28,7 +28,6 @@ exports[`EcogestureNotFound component should be rendered correctly 1`] = `
test
</div>
<button
- aria-label="error_page.back"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
diff --git a/src/components/Ecogesture/EcogestureResetModal/EcogestureResetModal.tsx b/src/components/Ecogesture/EcogestureResetModal/EcogestureResetModal.tsx
index b12843e71..837319408 100644
--- a/src/components/Ecogesture/EcogestureResetModal/EcogestureResetModal.tsx
+++ b/src/components/Ecogesture/EcogestureResetModal/EcogestureResetModal.tsx
@@ -62,18 +62,10 @@ const EcogestureResetModal = ({
{t('ecogesture.resetModal.text2')}
</div>
<div className="buttons-container">
- <Button
- aria-label={t('ecogesture.resetModal.btn1')}
- onClick={closeEcogestureResetModal}
- className="btnSecondary"
- >
+ <Button onClick={closeEcogestureResetModal} className="btnSecondary">
{t('ecogesture.resetModal.btn1')}
</Button>
- <Button
- aria-label={t('ecogesture.resetModal.btn2')}
- onClick={handleConfirmReset}
- className="btnPrimary"
- >
+ <Button onClick={handleConfirmReset} className="btnPrimary">
{t('ecogesture.resetModal.btn2')}
</Button>
</div>
diff --git a/src/components/Ecogesture/EcogestureResetModal/__snapshots__/EcogestureResetModal.spec.tsx.snap b/src/components/Ecogesture/EcogestureResetModal/__snapshots__/EcogestureResetModal.spec.tsx.snap
index ccaf95b8f..dbb5c320e 100644
--- a/src/components/Ecogesture/EcogestureResetModal/__snapshots__/EcogestureResetModal.spec.tsx.snap
+++ b/src/components/Ecogesture/EcogestureResetModal/__snapshots__/EcogestureResetModal.spec.tsx.snap
@@ -110,7 +110,6 @@ exports[`EcogestureResetModal component should be rendered correctly 1`] = `
class="buttons-container"
>
<button
- aria-label="ecogesture.resetModal.btn1"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
@@ -125,7 +124,6 @@ exports[`EcogestureResetModal component should be rendered correctly 1`] = `
/>
</button>
<button
- aria-label="ecogesture.resetModal.btn2"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
diff --git a/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap b/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap
index 7ccd15138..e1aeb7018 100644
--- a/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap
+++ b/src/components/Ecogesture/__snapshots__/EcogestureTabsView.spec.tsx.snap
@@ -126,7 +126,6 @@ exports[`EcogestureView component should be rendered correctly with 3 clickable
class="buttons"
>
<button
- aria-label="ecogesture.emptyList.btn1"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
@@ -138,7 +137,6 @@ exports[`EcogestureView component should be rendered correctly with 3 clickable
</span>
</button>
<button
- aria-label="ecogesture.emptyList.btn2"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
@@ -189,7 +187,6 @@ exports[`EcogestureView component should be rendered correctly with 3 clickable
class="buttons"
>
<button
- aria-label="ecogesture.emptyList.btn1"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
@@ -201,7 +198,6 @@ exports[`EcogestureView component should be rendered correctly with 3 clickable
</span>
</button>
<button
- aria-label="ecogesture.emptyList.btn2"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
diff --git a/src/components/EcogestureSelection/EcogestureSelectionDetail/EcogestureSelectionDetail.tsx b/src/components/EcogestureSelection/EcogestureSelectionDetail/EcogestureSelectionDetail.tsx
index 139480c97..055a71bf6 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionDetail/EcogestureSelectionDetail.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelectionDetail/EcogestureSelectionDetail.tsx
@@ -72,7 +72,6 @@ const EcogestureSelectionDetail = ({
</div>
<div className="buttons">
<Button
- aria-label={t('ecogesture_selection.button_objective')}
classes={{
root: 'btnSecondary',
label: 'text-14-bold',
@@ -83,7 +82,6 @@ const EcogestureSelectionDetail = ({
{t('ecogesture_selection.button_objective')}
</Button>
<Button
- aria-label={t('ecogesture_selection.button_doing')}
classes={{
root: 'btnSecondary',
label: 'text-14-bold',
@@ -94,7 +92,6 @@ const EcogestureSelectionDetail = ({
{t('ecogesture_selection.button_doing')}
</Button>
<Button
- aria-label={t('ecogesture_selection.button_skip')}
classes={{
root: 'btnSecondary',
label: 'text-14-bold',
diff --git a/src/components/EcogestureSelection/EcogestureSelectionDetail/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap b/src/components/EcogestureSelection/EcogestureSelectionDetail/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
index bbd6adbd9..8cf01231b 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionDetail/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
+++ b/src/components/EcogestureSelection/EcogestureSelectionDetail/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
@@ -69,7 +69,6 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
class="buttons"
>
<button
- aria-label="ecogesture_selection.button_objective"
class="MuiButtonBase-root MuiButton-root btnSecondary MuiButton-text"
tabindex="0"
type="button"
@@ -94,7 +93,6 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
/>
</button>
<button
- aria-label="ecogesture_selection.button_doing"
class="MuiButtonBase-root MuiButton-root btnSecondary MuiButton-text"
tabindex="0"
type="button"
@@ -119,7 +117,6 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
/>
</button>
<button
- aria-label="ecogesture_selection.button_skip"
class="MuiButtonBase-root MuiButton-root btnSecondary MuiButton-text"
tabindex="0"
type="button"
diff --git a/src/components/EcogestureSelection/EcogestureSelectionModal/EcogestureSelectionModal.tsx b/src/components/EcogestureSelection/EcogestureSelectionModal/EcogestureSelectionModal.tsx
index e1b6ca29b..e2782d56a 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionModal/EcogestureSelectionModal.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelectionModal/EcogestureSelectionModal.tsx
@@ -1,10 +1,10 @@
import { Button } from '@material-ui/core'
import Dialog from '@material-ui/core/Dialog'
import CloseIcon from 'assets/icons/ico/close.svg'
+import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import React from 'react'
import './ecogestureSelectionModal.scss'
-import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
interface EcogestureSelectionModalProps {
open: boolean
@@ -43,11 +43,7 @@ const EcogestureSelectionModal = ({
<div className="text text-16-normal">
{t('ecogesture_selection.selectionModal.text')}
</div>
- <Button
- aria-label={t('ecogesture_selection.selectionModal.button_close')}
- onClick={handleCloseClick}
- className="btnPrimary"
- >
+ <Button onClick={handleCloseClick} className="btnPrimary">
{t('ecogesture_selection.selectionModal.button_close')}
</Button>
</div>
diff --git a/src/components/EcogestureSelection/EcogestureSelectionModal/__snapshots__/EcogestureSelectionModal.spec.tsx.snap b/src/components/EcogestureSelection/EcogestureSelectionModal/__snapshots__/EcogestureSelectionModal.spec.tsx.snap
index ae7263537..313bf71d7 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionModal/__snapshots__/EcogestureSelectionModal.spec.tsx.snap
+++ b/src/components/EcogestureSelection/EcogestureSelectionModal/__snapshots__/EcogestureSelectionModal.spec.tsx.snap
@@ -75,7 +75,6 @@ exports[`EcogestureInitModal component should be rendered correctly 1`] = `
ecogesture_selection.selectionModal.text
</div>
<button
- aria-label="ecogesture_selection.selectionModal.button_close"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
diff --git a/src/components/Exploration/ExplorationOngoing.tsx b/src/components/Exploration/ExplorationOngoing.tsx
index 347081ae2..f734f64e0 100644
--- a/src/components/Exploration/ExplorationOngoing.tsx
+++ b/src/components/Exploration/ExplorationOngoing.tsx
@@ -61,7 +61,7 @@ const ExplorationOngoing = ({ userChallenge }: ExplorationOngoingProps) => {
{t('exploration.button_already_done')}
</Button>
<Button
- aria-label={t('exploration.accessibility.button_already_done')}
+ aria-label={t('exploration.accessibility.button_come_back')}
onClick={() => navigate(-1)}
className="btnSecondary"
>
diff --git a/src/components/Feedback/FeedbackModal.tsx b/src/components/Feedback/FeedbackModal.tsx
index 0889e0613..e8138c199 100644
--- a/src/components/Feedback/FeedbackModal.tsx
+++ b/src/components/Feedback/FeedbackModal.tsx
@@ -56,18 +56,10 @@ const FeedbackModal = () => {
<p className="text">{t('feedback.text1')}</p>
<p className="text">{t('feedback.text2')}</p>
<div className="actions">
- <Button
- aria-label={t('feedback.later')}
- onClick={closeModal}
- className="btnSecondary"
- >
+ <Button onClick={closeModal} className="btnSecondary">
{t('feedback.later')}
</Button>
- <Button
- aria-label={t('feedback.lets_go')}
- onClick={goToSAU}
- className="btnPrimary"
- >
+ <Button onClick={goToSAU} className="btnPrimary">
{t('feedback.lets_go')}
</Button>
</div>
diff --git a/src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap b/src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap
index 465fa6a2f..c0ee001c3 100644
--- a/src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap
+++ b/src/components/Feedback/__snapshots__/FeedbackModal.spec.tsx.snap
@@ -93,7 +93,6 @@ exports[`FeedbackModal component should render the component 1`] = `
class="actions"
>
<button
- aria-label="feedback.later"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
@@ -108,7 +107,6 @@ exports[`FeedbackModal component should render the component 1`] = `
/>
</button>
<button
- aria-label="feedback.lets_go"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
diff --git a/src/components/Options/ExportData/Modals/__snapshots__/exportLoadingModal.spec.tsx.snap b/src/components/Options/ExportData/Modals/__snapshots__/exportLoadingModal.spec.tsx.snap
index a3632b692..87ed15eef 100644
--- a/src/components/Options/ExportData/Modals/__snapshots__/exportLoadingModal.spec.tsx.snap
+++ b/src/components/Options/ExportData/Modals/__snapshots__/exportLoadingModal.spec.tsx.snap
@@ -101,7 +101,6 @@ exports[`ExportLoadingModal component should be rendered correctly 1`] = `
export.modal_loading.text2
</div>
<button
- aria-label="export.modal_loading.button_cancel"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
diff --git a/src/components/Options/ExportData/Modals/__snapshots__/exportStartModal.spec.tsx.snap b/src/components/Options/ExportData/Modals/__snapshots__/exportStartModal.spec.tsx.snap
index d0917f71a..ceeae77c5 100644
--- a/src/components/Options/ExportData/Modals/__snapshots__/exportStartModal.spec.tsx.snap
+++ b/src/components/Options/ExportData/Modals/__snapshots__/exportStartModal.spec.tsx.snap
@@ -95,7 +95,6 @@ exports[`exportStartModal component should be rendered correctly 1`] = `
class="buttons"
>
<button
- aria-label="export.modal_start.button_cancel"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnSecondary"
tabindex="0"
type="button"
@@ -110,7 +109,6 @@ exports[`exportStartModal component should be rendered correctly 1`] = `
/>
</button>
<button
- aria-label="export.button_download"
class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary"
tabindex="0"
type="button"
diff --git a/src/components/Options/ExportData/Modals/exportLoadingModal.tsx b/src/components/Options/ExportData/Modals/exportLoadingModal.tsx
index 4d9188185..f5da6d6f7 100644
--- a/src/components/Options/ExportData/Modals/exportLoadingModal.tsx
+++ b/src/components/Options/ExportData/Modals/exportLoadingModal.tsx
@@ -204,11 +204,7 @@ const ExportLoadingModal = ({
{t('export.modal_loading.text1')}
</div>
<div>{t('export.modal_loading.text2')}</div>
- <Button
- aria-label={t('export.modal_loading.button_cancel')}
- onClick={handleCloseClick}
- className="btnSecondary"
- >
+ <Button onClick={handleCloseClick} className="btnSecondary">
{t('export.modal_loading.button_cancel')}
</Button>
</div>
diff --git a/src/components/Options/ExportData/Modals/exportStartModal.tsx b/src/components/Options/ExportData/Modals/exportStartModal.tsx
index 6412e8c7b..1e7262857 100644
--- a/src/components/Options/ExportData/Modals/exportStartModal.tsx
+++ b/src/components/Options/ExportData/Modals/exportStartModal.tsx
@@ -55,18 +55,10 @@ const ExportStartModal = ({
{t('export.modal_start.text3')}
</div>
<div className="buttons">
- <Button
- aria-label={t('export.modal_start.button_cancel')}
- onClick={handleCloseClick}
- className="btnSecondary"
- >
+ <Button onClick={handleCloseClick} className="btnSecondary">
{t('export.modal_start.button_cancel')}
</Button>
- <Button
- aria-label={t('export.button_download')}
- onClick={handleDownloadClick}
- className="btnPrimary"
- >
+ <Button onClick={handleDownloadClick} className="btnPrimary">
{t('export.button_download')}
</Button>
</div>
diff --git a/src/components/Terms/TermsView.tsx b/src/components/Terms/TermsView.tsx
index d7262d8fc..f4e1e5602 100644
--- a/src/components/Terms/TermsView.tsx
+++ b/src/components/Terms/TermsView.tsx
@@ -102,11 +102,7 @@ const TermsView = () => {
<MinorUpdateContent />
</div>
<div className="terms-footer">
- <Button
- aria-label={t('minorUpdate.button')}
- onClick={handleTermValidate}
- className="btnPrimary"
- >
+ <Button onClick={handleTermValidate} className="btnPrimary">
{t('minorUpdate.button')}
</Button>
</div>
diff --git a/src/locales/fr.json b/src/locales/fr.json
index a37abcc8d..0de063730 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -277,6 +277,7 @@
},
"accessibility": {
"button_reveal_password": "Afficher le mot de passe",
+ "button_hide_password": "Masquer le mot de passe",
"button_connect": "Se connecter",
"button_create_account": "Se créer un compte",
"window_title": "Fenêtre d'information sur la création de compte.",
@@ -302,7 +303,8 @@
},
"locked": {
"desc": "À débloquer en terminant le défi précédent"
- }
+ },
+ "goto": "Aller vers le challenge"
},
"card_done": {
"saving": "Économie de",
--
GitLab