From db5ee123571a82b0a3f342a89d82c642c3f5bbae Mon Sep 17 00:00:00 2001 From: Mael Date: Mon, 19 Nov 2018 11:19:12 +0000 Subject: [PATCH 1/4] :alien: :bug: Erreurs ou oublis de traduction --- source/locales/en.yaml | 6 +++++- source/sites/mycompanyinfrance.fr/pages/404.js | 4 +++- .../sites/mycompanyinfrance.fr/pages/Company/YourCompany.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/locales/en.yaml b/source/locales/en.yaml index 89a6f2e9b..05bec99db 100644 --- a/source/locales/en.yaml +++ b/source/locales/en.yaml @@ -321,7 +321,7 @@ Choisir la forme juridique: Choose your legal status Plus tard: Do it later Responsabilité de l'entreprise: Liability -réponsabilité: +responsabilité: titre: Choosing the company liability in France description: Sole proprietorship or limited liability? Each option has legal implications, and leads to a different status for creating your company in France intro: An entrepreneur can choose between several options for the legal setup of his company @@ -380,6 +380,7 @@ trouver: titre: Find your company non: I don't have a company yet description: Thanks to the SIREN database, the public information of your company will be used automatically in the next steps. + ok: Confirm and simulate hiring costs Entrez le nom de votre société: Type your company name Nous n'avons rien trouvé: We didn't find any matching registered company. @@ -413,6 +414,9 @@ sécu: <0>Social protection: costs and benefits<1>France has chosen to provide its citizens with a high-quality social safety net. This mandatory system is based on solidarity and designed to ensure the general welfare of its people.<2>Easy access to health care and other services ensures that companies can put healthy, productive and highly skilled employees to work in an attractive market in the heart of Europe.<3>As soon as you declare and pay your employees, you automatically entitle them to the general scheme of French Social Security (health, maternity, disability, old age, occupational illness and accidents) and unemployment insurance.<4><0><5>How much does it cost to hire ? Votre entreprise: Your company +Ce n'est pas mon entreprise: This is not my company +Simuler une embauche: Simulate a hire + Protection sociale: Social security Embauche: Hiring process Micro-entreprise: Micro-enterprise diff --git a/source/sites/mycompanyinfrance.fr/pages/404.js b/source/sites/mycompanyinfrance.fr/pages/404.js index cdc9a911f..2d202ca5d 100644 --- a/source/sites/mycompanyinfrance.fr/pages/404.js +++ b/source/sites/mycompanyinfrance.fr/pages/404.js @@ -4,6 +4,8 @@ import emoji from 'react-easy-emoji' export default () => ( <>

404

-

{emoji('🙅')} La page que vous cherchez n'existe pas / plus

+

+ {emoji('🙅')} La page que vous cherchez n'existe pas ou n'existe plus. +

) diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/YourCompany.js b/source/sites/mycompanyinfrance.fr/pages/Company/YourCompany.js index a6ce70264..d5705fad1 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/YourCompany.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/YourCompany.js @@ -75,7 +75,7 @@ const YourCompany = ({ companyDetails, resetCompanyDetails }) => (

- Simuler un salaire + Simuler une embauche

From dfe1e70eb477a0f184e90bf1b4b6e972d6e8436c Mon Sep 17 00:00:00 2001 From: Mael Date: Mon, 19 Nov 2018 11:23:36 +0000 Subject: [PATCH 2/4] :bug: SA manquante dans /create-SA --- source/sites/mycompanyinfrance.fr/sitePaths.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/sites/mycompanyinfrance.fr/sitePaths.js b/source/sites/mycompanyinfrance.fr/sitePaths.js index 4cd639b9c..00cd3a00e 100644 --- a/source/sites/mycompanyinfrance.fr/sitePaths.js +++ b/source/sites/mycompanyinfrance.fr/sitePaths.js @@ -11,7 +11,8 @@ export const LANDING_LEGAL_STATUS_LIST: Array = [ 'SARL', 'SASU', 'SNC', - 'micro-entreprise' + 'micro-entreprise', + 'SA' ] const translateTo = language => (str1, str2, options = {}) => From 2991175ec2d51b238d5b015f1b89e3cb524f6522 Mon Sep 17 00:00:00 2001 From: Mael Date: Mon, 19 Nov 2018 11:34:01 +0000 Subject: [PATCH 3/4] :alien: :bug: Traduction du menu --- source/locales/en.yaml | 6 ++++-- .../layout/Navigation/Navigation.js | 18 ++++++++++++------ .../pages/Company/DirectorStatus.js | 8 ++++---- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/source/locales/en.yaml b/source/locales/en.yaml index 05bec99db..d59e487d2 100644 --- a/source/locales/en.yaml +++ b/source/locales/en.yaml @@ -424,7 +424,7 @@ Entreprise Individuelle: Individual Business listeformejuridique: page: titre: Legal status list for creating your company in France -status du directeur: +statut du directeur: page: description: This choice is important because it determines the director's Social Security scheme and coverage. Each option has legal implications, and leads to a different status when creating your company in France titre: Defining the director's status @@ -488,7 +488,7 @@ embauche: <2>Get an example payslip -Guide du status juridique: Legal status guide +Guide du statut juridique: Legal status guide Démarches de création: Creation process checklist path: @@ -534,3 +534,5 @@ Ville: City Région: Region Nombre d'employés: Number of employees Date de création: Creation date + +Liste des statuts: Legal status list diff --git a/source/sites/mycompanyinfrance.fr/layout/Navigation/Navigation.js b/source/sites/mycompanyinfrance.fr/layout/Navigation/Navigation.js index 8e448ec59..3976ccf94 100644 --- a/source/sites/mycompanyinfrance.fr/layout/Navigation/Navigation.js +++ b/source/sites/mycompanyinfrance.fr/layout/Navigation/Navigation.js @@ -72,7 +72,7 @@ const StepsHeader = ({ sitePaths().entreprise.statusJuridique .multipleAssociates }> - Nombre d'associés + Nombre d'associés
  • @@ -81,7 +81,9 @@ const StepsHeader = ({ sitePaths().entreprise.statusJuridique .directorStatus }> - Status du dirigeant + + Statut du dirigeant +
  • @@ -90,7 +92,7 @@ const StepsHeader = ({ sitePaths().entreprise.statusJuridique .liability }> - Responsabilité + Responsabilité
  • @@ -99,7 +101,9 @@ const StepsHeader = ({ sitePaths().entreprise.statusJuridique .minorityDirector }> - Gérant majoritaire ou minoritaire + + Gérant majoritaire ou minoritaire +
  • @@ -108,7 +112,9 @@ const StepsHeader = ({ sitePaths().entreprise.statusJuridique .microEnterprise }> - Micro-entreprise ou EI + + Micro-entreprise ou EI +
  • @@ -116,7 +122,7 @@ const StepsHeader = ({ to={ sitePaths().entreprise.statusJuridique.liste }> - Liste des status + Liste des statuts
    • diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/DirectorStatus.js b/source/sites/mycompanyinfrance.fr/pages/Company/DirectorStatus.js index 31bee304c..1749edcc0 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/DirectorStatus.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/DirectorStatus.js @@ -17,20 +17,20 @@ const DefineDirectorStatus = ({ defineDirectorStatus, t }: Props) => ( <> - {t('status du directeur.titre', 'Définir le statut du directeur')} + {t('statut du directeur.titre', 'Définir le statut du directeur')}

    - Définir le status du directeur + Définir le statut du directeur

    - +

    Ce choix est important parce qu'il détermine le régime de sécurité sociale et la couverture sociale du dirigeant. From a775394044a321977bccb09299fb5e4558e7bebb Mon Sep 17 00:00:00 2001 From: Mael Date: Mon, 19 Nov 2018 11:44:19 +0000 Subject: [PATCH 4/4] :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