diff --git a/frontend/src/guidance/StrengthCategory.js b/frontend/src/guidance/StrengthCategory.js index 2c772eeced..8ff5e1bd9f 100644 --- a/frontend/src/guidance/StrengthCategory.js +++ b/frontend/src/guidance/StrengthCategory.js @@ -1,12 +1,11 @@ import React from 'react' import PropTypes from 'prop-types' import { Box, Text } from '@chakra-ui/react' -import { t, Trans } from '@lingui/macro' +import { Trans } from '@lingui/macro' -export function StrengthCategory({ items, strength, type }) { +export function StrengthCategory({ items, strength, title }) { let titleBg = 'info' let mainBg = 'info' - let title = '' switch (strength) { case 'strong': @@ -23,15 +22,6 @@ export function StrengthCategory({ items, strength, type }) { break } - switch (type) { - case 'ciphers': - title = t`Strong Ciphers:` - break - case 'curves': - title = t`Strong Curves:` - break - } - const mapCiphers = (cipherList) => { return ( @@ -67,5 +57,5 @@ export function StrengthCategory({ items, strength, type }) { StrengthCategory.propTypes = { items: PropTypes.arrayOf(PropTypes.string).isRequired, strength: PropTypes.oneOf(['strong', 'acceptable', 'weak']).isRequired, - type: PropTypes.oneOf(['curves', 'ciphers']).isRequired, + title: PropTypes.string.isRequired, } diff --git a/frontend/src/guidance/WebGuidance.js b/frontend/src/guidance/WebGuidance.js index 386b6e54a3..2e716c12b7 100644 --- a/frontend/src/guidance/WebGuidance.js +++ b/frontend/src/guidance/WebGuidance.js @@ -68,17 +68,17 @@ const WebGuidance = ({ webScan, sslStatus, httpsStatus }) => { @@ -86,17 +86,17 @@ const WebGuidance = ({ webScan, sslStatus, httpsStatus }) => { diff --git a/frontend/src/locales/en.po b/frontend/src/locales/en.po index bb64645236..ba1bd5e6b1 100644 --- a/frontend/src/locales/en.po +++ b/frontend/src/locales/en.po @@ -73,13 +73,13 @@ msgstr "A verification link has been sent to your email account" msgid "ADMIN" msgstr "ADMIN" -#: src/guidance/ScanDetails.js:156 -#~ msgid "Acceptable Ciphers:" -#~ msgstr "Acceptable Ciphers:" +#: src/guidance/WebGuidance.js:76 +msgid "Acceptable Ciphers:" +msgstr "Acceptable Ciphers:" -#: src/guidance/ScanDetails.js:189 -#~ msgid "Acceptable Curves:" -#~ msgstr "Acceptable Curves:" +#: src/guidance/WebGuidance.js:94 +msgid "Acceptable Curves:" +msgstr "Acceptable Curves:" #: src/termsConditions/TermsConditionsPage.js:85 msgid "Access to Information" @@ -1706,7 +1706,7 @@ msgstr "No values were supplied when attempting to update organization details." msgid "Non-compliant" msgstr "Non-compliant" -#: src/guidance/StrengthCategory.js:48 +#: src/guidance/StrengthCategory.js:38 #: src/user/EditableUserTFAMethod.js:164 msgid "None" msgstr "None" @@ -2388,11 +2388,11 @@ msgstr "Sort by:" msgid "Source IP Address" msgstr "Source IP Address" -#: src/guidance/StrengthCategory.js:28 +#: src/guidance/WebGuidance.js:71 msgid "Strong Ciphers:" msgstr "Strong Ciphers:" -#: src/guidance/StrengthCategory.js:31 +#: src/guidance/WebGuidance.js:89 msgid "Strong Curves:" msgstr "Strong Curves:" @@ -2864,13 +2864,13 @@ msgstr "We've sent an SMS to your registered phone number with an authentication msgid "We've sent you an email with an authentication code to sign into Tracker." msgstr "We've sent you an email with an authentication code to sign into Tracker." -#: src/guidance/ScanDetails.js:165 -#~ msgid "Weak Ciphers:" -#~ msgstr "Weak Ciphers:" +#: src/guidance/WebGuidance.js:81 +msgid "Weak Ciphers:" +msgstr "Weak Ciphers:" -#: src/guidance/ScanDetails.js:198 -#~ msgid "Weak Curves:" -#~ msgstr "Weak Curves:" +#: src/guidance/WebGuidance.js:99 +msgid "Weak Curves:" +msgstr "Weak Curves:" #: src/admin/WebCheckPage.js:173 msgid "Web Check" @@ -3055,7 +3055,7 @@ msgid "https://https-everywhere.canada.ca/en/help/" msgstr "https://https-everywhere.canada.ca/en/help/" #: src/app/App.js:118 -#: src/app/App.js:341 +#: src/app/App.js:339 #: src/user/MyTrackerPage.js:43 #: src/user/MyTrackerPage.js:74 msgid "myTracker" diff --git a/frontend/src/locales/fr.po b/frontend/src/locales/fr.po index 3efa1bebc5..3096711274 100644 --- a/frontend/src/locales/fr.po +++ b/frontend/src/locales/fr.po @@ -73,13 +73,13 @@ msgstr "Un lien de vérification a été envoyé à votre compte de messagerie." msgid "ADMIN" msgstr "ADMIN" -#: src/guidance/ScanDetails.js:156 -#~ msgid "Acceptable Ciphers:" -#~ msgstr "Ciphers acceptés:" +#: src/guidance/WebGuidance.js:76 +msgid "Acceptable Ciphers:" +msgstr "Ciphers acceptés:" -#: src/guidance/ScanDetails.js:189 -#~ msgid "Acceptable Curves:" -#~ msgstr "Courbes acceptables:" +#: src/guidance/WebGuidance.js:94 +msgid "Acceptable Curves:" +msgstr "Courbes acceptables:" #: src/termsConditions/TermsConditionsPage.js:85 msgid "Access to Information" @@ -1690,7 +1690,7 @@ msgstr "Aucune valeur n'a été fournie lors de la tentative de mise à jour des msgid "Non-compliant" msgstr "Non conforme" -#: src/guidance/StrengthCategory.js:48 +#: src/guidance/StrengthCategory.js:38 #: src/user/EditableUserTFAMethod.js:164 msgid "None" msgstr "Aucun" @@ -2372,11 +2372,11 @@ msgstr "Trier par:" msgid "Source IP Address" msgstr "Adresse IP source" -#: src/guidance/StrengthCategory.js:28 +#: src/guidance/WebGuidance.js:71 msgid "Strong Ciphers:" msgstr "Ciphers forts:" -#: src/guidance/StrengthCategory.js:31 +#: src/guidance/WebGuidance.js:89 msgid "Strong Curves:" msgstr "Courbes fortes:" @@ -2844,13 +2844,13 @@ msgstr "Nous avons envoyé un SMS à votre numéro de téléphone enregistré av msgid "We've sent you an email with an authentication code to sign into Tracker." msgstr "Nous vous avons envoyé un e-mail avec un code d'authentification pour vous connecter à Suivi." -#: src/guidance/ScanDetails.js:165 -#~ msgid "Weak Ciphers:" -#~ msgstr "Ciphers faibles:" +#: src/guidance/WebGuidance.js:81 +msgid "Weak Ciphers:" +msgstr "Ciphers faibles:" -#: src/guidance/ScanDetails.js:198 -#~ msgid "Weak Curves:" -#~ msgstr "Courbes faibles:" +#: src/guidance/WebGuidance.js:99 +msgid "Weak Curves:" +msgstr "Courbes faibles:" #: src/admin/WebCheckPage.js:173 msgid "Web Check" @@ -3027,7 +3027,7 @@ msgid "https://https-everywhere.canada.ca/en/help/" msgstr "https://https-everywhere.canada.ca/en/help/" #: src/app/App.js:118 -#: src/app/App.js:341 +#: src/app/App.js:339 #: src/user/MyTrackerPage.js:43 #: src/user/MyTrackerPage.js:74 msgid "myTracker"