From a775394044a321977bccb09299fb5e4558e7bebb Mon Sep 17 00:00:00 2001 From: Mael Date: Mon, 19 Nov 2018 11:44:19 +0000 Subject: [PATCH] :bug: :alien: Clef micro-entreprise pas micro-enterprise MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Des switchs étaient basés sur une confusion entre les deux Le premier est compréhensible par un anglais, et reste le terme exact du statut juridique, comme les autres en initiales. --- source/locales/en.yaml | 2 +- source/selectors/companyStatusSelectors.js | 4 +- .../layout/Navigation/Navigation.js | 2 +- .../pages/Company/CreationChecklist.js | 4 +- .../pages/Company/Microenterprise.js | 2 +- .../pages/Company/PickLegalStatus.js | 71 ++++++++++++------- .../sites/mycompanyinfrance.fr/sitemap.en.txt | 6 +- 7 files changed, 57 insertions(+), 34 deletions(-) diff --git a/source/locales/en.yaml b/source/locales/en.yaml index d59e487d2..276787089 100644 --- a/source/locales/en.yaml +++ b/source/locales/en.yaml @@ -505,7 +505,7 @@ path: responsabilité: '/liability' statusDirigeant: '/directors-status' nombreAssociés: '/multiple-associates' - microEntreprise: '/micro-enterprise-or-individual-business' + microEntreprise: '/micro-entreprise-or-individual-business' sécuritéSociale: index: '/social-security' démarcheEmbauche: diff --git a/source/selectors/companyStatusSelectors.js b/source/selectors/companyStatusSelectors.js index 2d8eaa52c..75ac71247 100644 --- a/source/selectors/companyStatusSelectors.js +++ b/source/selectors/companyStatusSelectors.js @@ -15,14 +15,14 @@ import { import sitePaths from '../sites/mycompanyinfrance.fr/sitePaths' const LEGAL_STATUS_DETAILS: { [status: string]: CompanyLegalStatus } = { - 'Micro-enterprise': { + 'Micro-entreprise': { liability: 'UNLIMITED_LIABILITY', directorStatus: 'SELF_EMPLOYED', minorityDirector: false, multipleAssociates: false, microEnterprise: true }, - 'Micro-enterprise (option EIRL)': { + 'Micro-entreprise (option EIRL)': { liability: 'LIMITED_LIABILITY', directorStatus: 'SELF_EMPLOYED', multipleAssociates: false, diff --git a/source/sites/mycompanyinfrance.fr/layout/Navigation/Navigation.js b/source/sites/mycompanyinfrance.fr/layout/Navigation/Navigation.js index 3976ccf94..12dcfe3c2 100644 --- a/source/sites/mycompanyinfrance.fr/layout/Navigation/Navigation.js +++ b/source/sites/mycompanyinfrance.fr/layout/Navigation/Navigation.js @@ -143,7 +143,7 @@ const StepsHeader = ({
  • Micro-entreprise diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js b/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js index b525ead42..8946c6bd9 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js @@ -215,7 +215,7 @@ const CreateCompany = ({ } /> - {!['EI', 'EIRL', 'micro-enterprise'].includes(companyStatus) && ( + {!['EI', 'EIRL', 'micro-entreprise'].includes(companyStatus) && ( - {companyStatus !== 'micro-enterprise' && ( + {companyStatus !== 'micro-entreprise' && ( (

    - Micro-enterprise ou entreprise individuelle (EI) ? + Micro-entreprise ou entreprise individuelle (EI) ?

    diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/PickLegalStatus.js b/source/sites/mycompanyinfrance.fr/pages/Company/PickLegalStatus.js index 883a07b14..5d240a232 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/PickLegalStatus.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/PickLegalStatus.js @@ -4,14 +4,14 @@ import Helmet from 'react-helmet' import { connect } from 'react-redux' import { Link } from 'react-router-dom' import { possibleStatusSelector } from 'Selectors/companyStatusSelectors' -import { withI18n } from 'react-i18next'; +import { withI18n } from 'react-i18next' import StatusDescription from './StatusDescription' import type { RouterHistory } from 'react-router' -import {compose} from 'ramda' +import { compose } from 'ramda' import type { LegalStatus } from 'Selectors/companyStatusSelectors' import withLanguage from 'Components/utils/withLanguage' import type { TFunction } from 'react-i18next' -import sitePaths from '../../sitePaths'; +import sitePaths from '../../sitePaths' const setMainStatus = () => {} @@ -23,17 +23,24 @@ type Props = { t: TFunction } -const StatusButton = withI18n()(({ status, t }: { status: LegalStatus, t: TFunction }) => ( - - Créer une {t(status)} - -)) +const StatusButton = withI18n()( + ({ status, t }: { status: LegalStatus, t: TFunction }) => ( + + Créer une {t(status)} + + ) +) const SetMainStatus = ({ history, possibleStatus, t, language }: Props) => { return ( <> - {t('listeformejuridique.page.titre', 'Liste des statuts juridiques pour la création de votre entreprise')} + + {t( + 'listeformejuridique.page.titre', + 'Liste des statuts juridiques pour la création de votre entreprise' + )} +

    Votre forme juridique @@ -43,7 +50,8 @@ const SetMainStatus = ({ history, possibleStatus, t, language }: Props) => { {possibleStatus.EI && (
  • - EI - Entreprise individuelle {language !== 'fr' && '(Individual business)'}:{' '} + EI - Entreprise individuelle{' '} + {language !== 'fr' && '(Individual business)'}:{' '}
    @@ -54,7 +62,9 @@ const SetMainStatus = ({ history, possibleStatus, t, language }: Props) => {
  • EIRL - Entrepreneur individuel à responsabilité limitée{' '} - {language !== 'fr' && '(Individual entrepreneur with limited liability)'}:{' '} + {language !== 'fr' && + '(Individual entrepreneur with limited liability)'} + :{' '}
    @@ -99,7 +109,8 @@ const SetMainStatus = ({ history, possibleStatus, t, language }: Props) => {
  • SASU - Société par action simplifiée unipersonnelle{' '} - {language !== 'fr' && '(Simplified personal joint stock company)'}:{' '} + {language !== 'fr' && '(Simplified personal joint stock company)'} + :{' '}
    @@ -108,8 +119,9 @@ const SetMainStatus = ({ history, possibleStatus, t, language }: Props) => { )} {possibleStatus.SA && (
  • - SA - Société anonyme{' '} - {language !== 'fr' && '(Anonymous company)'}:{' '} + + SA - Société anonyme {language !== 'fr' && '(Anonymous company)'}:{' '} +
    @@ -117,18 +129,23 @@ const SetMainStatus = ({ history, possibleStatus, t, language }: Props) => { )} {possibleStatus.SNC && (
  • - SNC - Société en nom collectif{' '} - {language !== 'fr' && '(Partnership)'}:{' '} + + SNC - Société en nom collectif{' '} + {language !== 'fr' && '(Partnership)'}:{' '} +
    • )} - {(possibleStatus['Micro-enterprise (option EIRL)'] || - possibleStatus['Micro-enterprise']) && ( + {(possibleStatus['Micro-entreprise (option EIRL)'] || + possibleStatus['Micro-entreprise']) && (
  • - Micro-enterprise{language === 'fr' && ' (auto-entrepreneur) '}: + + Micro-entreprise + {language === 'fr' && ' (auto-entrepreneur) '}:{' '} +
    @@ -136,14 +153,20 @@ const SetMainStatus = ({ history, possibleStatus, t, language }: Props) => { )}
    - + Choose later ›
    ) } -export default compose(withI18n(), withLanguage, connect( - state => ({ possibleStatus: possibleStatusSelector(state) }), - { setMainStatus } -))(SetMainStatus) +export default compose( + withI18n(), + withLanguage, + connect( + state => ({ possibleStatus: possibleStatusSelector(state) }), + { setMainStatus } + ) +)(SetMainStatus) diff --git a/source/sites/mycompanyinfrance.fr/sitemap.en.txt b/source/sites/mycompanyinfrance.fr/sitemap.en.txt index 0d1002107..66c9e8b80 100644 --- a/source/sites/mycompanyinfrance.fr/sitemap.en.txt +++ b/source/sites/mycompanyinfrance.fr/sitemap.en.txt @@ -7,15 +7,15 @@ https://mycompanyinfrance.fr/company/create-a-SAS https://mycompanyinfrance.fr/company/create-a-SARL https://mycompanyinfrance.fr/company/create-a-SASU https://mycompanyinfrance.fr/company/create-a-SNC -https://mycompanyinfrance.fr/company/create-a-micro-enterprise +https://mycompanyinfrance.fr/company/create-a-micro-entreprise https://mycompanyinfrance.fr/company/find https://mycompanyinfrance.fr/company/after-registration https://mycompanyinfrance.fr/company/legal-status https://mycompanyinfrance.fr/company/legal-status/list https://mycompanyinfrance.fr/company/legal-status/liability https://mycompanyinfrance.fr/company/legal-status/directors-status -https://mycompanyinfrance.fr/company/legal-status/micro-enterprise-or-individual-business +https://mycompanyinfrance.fr/company/legal-status/micro-entreprise-or-individual-business https://mycompanyinfrance.fr/company/legal-status/multiple-associates https://mycompanyinfrance.fr/company/legal-status/chairman-or-managing-director https://mycompanyinfrance.fr/social-security -https://mycompanyinfrance.fr/hiring-process \ No newline at end of file +https://mycompanyinfrance.fr/hiring-process