betagouv
/
mon-entreprise
mirror of https://github.com/betagouv/mon-entreprise
1
0
Fork 0
Code Releases Activity

👽 traduit le logo de chargement

pull/629/head
Johan Girod 2019-09-03 17:40:28 +02:00
parent d92a12c307
commit b9ecd290fa
No known key found for this signature in database
GPG Key ID: 9E27B57DA2E8AE12
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.html
View File

@ -56,7 +56,10 @@
content="<%= htmlWebpackPlugin.options.description %>"
/>
<meta property="og:image" content="<%= htmlWebpackPlugin.options.logo %>" />
<meta
property="og:image"
content="<%= htmlWebpackPlugin.options.shareImage %>"
/>
<!-- data-helmet pour que React Helmet puisse écraser ce meta par défaut -->
<link
href="https://fonts.googleapis.com/css?family=Roboto:300,400,400i,500,600|Montserrat:400,600"
@ -189,7 +192,7 @@
<body>
<div id="loading">
<img
src="images/logo.svg"
src="<%= htmlWebpackPlugin.options.logo %>"
alt="Un service de l'État français"
style="width: 300px; margin: auto; margin-bottom: 0.6rem; display:block"
/>

6
source/components/PaySlipSections.js
View File

@ -57,15 +57,11 @@ export let SalaireNetSection = ({ getRule }) => {
<Line rule={getRule('contrat salarié . rémunération . net')} />
</>
) : null}
<<<<<<< HEAD
<Line negative rule={getRule('impôt')} />
<Line rule={getRule('contrat salarié . salaire . net après impôt')} />
=======
<Line negative rule={getRule('impôt . neutre')} />
<Line
rule={getRule('contrat salarié . rémunération . net après impôt')}
/>
>>>>>>> :hammer: ajoute la défiscalisation des heures supplémentaires
</div>
)
}

1
source/locales/en.yaml
View File

@ -125,6 +125,7 @@ quicklinks:
Type d'activité: Activity type
Charges: Expenses
autres: 'Other questions:'
Impôt: Tax
Mes réponses: My answers
Prochaines questions: Next questions
Modifier mes réponses: Change my answers

6
source/webpack.common.js
View File

@ -136,7 +136,8 @@ module.exports.HTMLPlugins = ({ injectTrackingScript = false } = {}) => [
description:
'Find the type of company that suits you and follow the steps to register your company. Discover the French social security system by simulating your hiring costs. Discover the procedures to hire in France and learn the basics of French labour law.',
filename: 'infrance.html',
logo: 'https://mon-entreprise.fr/images/logo-mycompany-share.png'
shareImage: 'https://mon-entreprise.fr/images/logo-mycompany-share.png',
logo: 'images/logo-mycompany.svg'
}),
new HTMLPlugin({
template: 'index.html',
@ -148,6 +149,7 @@ module.exports.HTMLPlugins = ({ injectTrackingScript = false } = {}) => [
description:
'Du statut juridique à la première embauche, en passant par la simulation des cotisations, vous trouverez ici toutes les ressources pour démarrer votre activité.',
filename: 'mon-entreprise.html',
logo: 'https://mon-entreprise.fr/images/logo-share.png'
shareImage: 'https://mon-entreprise.fr/images/logo-share.png',
logo: 'images/logo.svg'
})
]