diff --git a/package.json b/package.json index 019153802..3f140269d 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "i18n:rules:check": "node source/scripts/i18n/check-missing-rule-translation.js", "i18n:rules:translate": "node source/scripts/i18n/translate-rules.js", "i18n:ui:check": "yarn run i18next && node source/scripts/i18n/check-missing-UI-translation", - "i18n:ui:translate": "yarn run i18next && node source/scripts/i18n/translate-ui.js", + "i18n:ui:translate": "rm -rf source/locales/static-analysis-fr.json && yarn run i18next && node source/scripts/i18n/translate-ui.js", "mon-entreprise:serve": "PORT=5000 serve --config serve.mon-entreprise.json --no-clipboard", "mon-entreprise:test": "cypress open --browser chromium", "mycompanyinfrance:serve": "PORT=5001 serve --config serve.infrance.json --no-clipboard", diff --git a/source/components/SchemeComparaison.tsx b/source/components/SchemeComparaison.tsx index d7861f913..cf512f4ef 100644 --- a/source/components/SchemeComparaison.tsx +++ b/source/components/SchemeComparaison.tsx @@ -1,5 +1,8 @@ import { setSimulationConfig, setSituationBranch } from 'Actions/actions' -import { defineDirectorStatus, isAutoentrepreneur } from 'Actions/companyStatusActions' +import { + defineDirectorStatus, + isAutoentrepreneur +} from 'Actions/companyStatusActions' import classnames from 'classnames' import Conversation from 'Components/conversation/Conversation' import SeeAnswersButton from 'Components/conversation/SeeAnswersButton' @@ -15,7 +18,10 @@ import { Trans } from 'react-i18next' import { useDispatch, useSelector } from 'react-redux' import { Link } from 'react-router-dom' import { RootState } from 'Reducers/rootReducer' -import { analysisWithDefaultsSelector, branchAnalyseSelector } from 'Selectors/analyseSelectors' +import { + analysisWithDefaultsSelector, + branchAnalyseSelector +} from 'Selectors/analyseSelectors' import { DottedName } from 'Types/rule' import Animate from 'Ui/animate' import InfoBulle from 'Ui/InfoBulle' @@ -113,7 +119,9 @@ export default function SchemeComparaison({
{hideAssimiléSalarié ? ( - EI ou EIRL + + EI ou EIRL + ) : ( EI, EIRL, EURL ou SARL avec gérant majoritaire @@ -122,7 +130,9 @@ export default function SchemeComparaison({
- Auto-entreprise + + Auto-entreprise +
@@ -169,7 +179,7 @@ export default function SchemeComparaison({ <>

ACRE

-
+
1 an (sous conditions d'éligibilité)
@@ -243,7 +253,7 @@ export default function SchemeComparaison({
Oui - (70 000 € en services / 170 000 € en vente de biens, + (72 500 € en services / 176 200 € en vente de biens, restauration ou hébergement)
@@ -584,7 +594,9 @@ export default function SchemeComparaison({ Entreprise individuelle ) : ( - Indépendant + + Indépendant + )} {!hideAutoEntrepreneur && ( diff --git a/source/locales/en.yaml b/source/locales/en.yaml index 4afeb17ff..19c441928 100644 --- a/source/locales/en.yaml +++ b/source/locales/en.yaml @@ -945,12 +945,6 @@ comparaisonRégimes: <2> Highly recommended indemnités: | <0> Sickness allowances - plafondCA: | - <0> Turnover ceiling - <1>No - <2> - Yes<1>(€70,000 in services, €170,000 for sale of properties, food or accommodation) - période: | <0>Period retraite: | @@ -964,10 +958,6 @@ comparaisonRégimes: chartered management centre...) <2> Simplified <1>(can be managed by the auto-entrepreneur) - ACRE: | - <0>ACRE - <1>1 year<1>(partial contribution exemption) - <2>3 years<1>(application of reduced contribution rates) déduction: | <0> Deduction of expenses <1>Yes <1>(tax regime of the actual) @@ -1034,6 +1024,10 @@ comparaisonRégimes: indep: Independent EI: Sole proprietorship trimestreValidés: <0>Number of quarters validated <1>(for retirement) + ACRE: <0>ACRE<1>1 year <1>(subject to eligibility requirements) + plafondCA: >- + <0>Turnover ceiling<1><0>No<2><0>Yes<1>(72,500 € in services + / 176,200 € in the sale of goods, catering or accommodation) J'ai compris: understood trimestres validés: validated quarters Année d'activité: Years of activity @@ -1048,7 +1042,7 @@ Pas implémenté: Not implemented Votre entreprise: Your company Crée le: Created on domiciliée à: domiciled in -"Nom de l'entreprise ou SIREN ": Company name or SIREN code +'Nom de l''entreprise ou SIREN ': Company name or SIREN code Ressources utiles: Helpful resources Aucun résultat: No result$ inférieurs à: lower than