Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
ericjeangirard committed Oct 31, 2023
2 parents 5dc7fb6 + 2e2045f commit 46f802d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
4 changes: 3 additions & 1 deletion src/config/locals.json
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,9 @@
"199213422D": {
"name": "Sport et sciences sociales (E3S - UR 1342)",
"commentsName": "de l'E3S",
"commentsNameEN": "of E3S"
"commentsNameEN": "of E3S",
"paysage": "smumc",
"scale": "laboratory"
},
"199312380": {
"name": "Université Sorbonne Paris Nord",
Expand Down
24 changes: 10 additions & 14 deletions src/pages/About/Methodology/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,17 @@ function Methodology() {

return (
<>
<div className='methodology'>
<Banner
backgroundColor='blue-soft-50'
textColor='blue-dark-150'
supTitle={<FormattedMessage id='app.header.title' />}
title={<FormattedMessage id='app.header.nav.a-propos-methodologie' />}
icons={renderIcons}
/>
</div>
<Container>
<section className='content py-48'>
<section className='content py-4'>
<Row gutters>
<Col n='12 md-6 lg-6'>
<h4 className='marianne-bold fs-24-32'>
Expand Down Expand Up @@ -565,19 +574,6 @@ function Methodology() {
</Container>
</div>
)}
{isInProduction() && (
<div className='methodology'>
<Banner
backgroundColor='blue-soft-50'
textColor='blue-dark-150'
supTitle={<FormattedMessage id='app.header.title' />}
title={
<FormattedMessage id='app.header.nav.a-propos-methodologie' />
}
icons={renderIcons}
/>
</div>
)}
<Container>
<section className='content py-28'>
<Row gutters>
Expand Down
2 changes: 1 addition & 1 deletion src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@
"app.national-publi.others.retractions.chart-by-year.title": "Rate of retracted publications by year of publication",
"app.national-publi.others.retractions.chart-by-field.title": "Rate of retracted publications by scientific field",
"app.navigation.objet-recherche": "Research object navigation",
"app.methodologie.publication": "Méthodology for publications",
"app.methodologie.publication": "Methodology for monitoring open access to publications",
"app.methodologie.publication.description-fr": "Methodology in French (pdf)",
"app.methodologie.publication.description-en": "Methodology in English (pdf)",
"app.methodologie.data_software": "Methodology for research data, software and code",
Expand Down

0 comments on commit 46f802d

Please sign in to comment.