Skip to content

Commit 158d8c6

Browse files
authored
Merge pull request #278 from CaptainFact/improvement/misc
Minor improvements before release
2 parents ad2a971 + 6f22288 commit 158d8c6

4 files changed

Lines changed: 21 additions & 15 deletions

File tree

app/components/Home/AllContributors.jsx

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,23 @@ import React from 'react'
22
import { withNamespaces } from 'react-i18next'
33
import ExternalLinkNewTab from '../Utils/ExternalLinkNewTab'
44

5-
65
const ROLE_AMBASSADOR = 'ambassador'
76
const ROLE_AMBASSADOR_PADAWAN = 'ambassadorPadawan'
87
const ROLE_DEVELOPER = 'developer'
98
const ROLE_DONATOR = 'donator'
109
const ROLE_PARTNER = 'partner'
1110

11+
// prettier-ignore
1212
const CONTRIBUTORS = [
1313
{ role: ROLE_AMBASSADOR, name: 'Frédéric Bouffetier', picture: 'frederic' },
1414
{ role: ROLE_AMBASSADOR, name: 'Timothée Roland', picture: 'timothee' },
15-
{ role: ROLE_AMBASSADOR_PADAWAN, name: 'Dorian Cazottes', picture: 'dorian' },
15+
{ role: ROLE_AMBASSADOR, name: 'Dorian Cazottes', picture: 'dorian' },
1616
{ role: ROLE_PARTNER, name: 'ThinkerView', picture: 'thinkerview', url: 'https://thinkerview.com' },
1717
{ role: ROLE_PARTNER, name: 'Heu?reka', picture: 'heureka', url: 'https://www.youtube.com/channel/UC7sXGI8p8PvKosLWagkK9wQ' },
1818
{ role: ROLE_PARTNER, name: 'La Tronche en Biais', picture: 'troncheenbiais', url: 'https://www.youtube.com/user/TroncheEnBiais' },
19-
{ role: ROLE_PARTNER, name: 'IMAGO', picture: 'imago', url: 'http://imagotv.fr/pdf/imago_presentation.pdf' },
19+
{ role: ROLE_PARTNER, name: 'Système D', picture: 'systemed', url: 'https://www.systeme-d.co/' },
20+
{ role: ROLE_PARTNER, name: 'Démocratie Ouverte', picture: 'democratie-ouverte', url: 'https://democratieouverte.org' },
21+
{ role: ROLE_PARTNER, name: 'IMAGO', picture: 'imago', url: 'http://imagotv.fr' },
2022
{ role: ROLE_PARTNER, name: 'TedX Nouméa', picture: 'tedxnoumea', url: 'https://tedxnoumea.com' },
2123
{ role: ROLE_PARTNER, name: 'YesWeHack', picture: 'yeswehack', url: 'https://yeswehack.com' },
2224
{ role: ROLE_PARTNER, name: 'Maia Mater', picture: 'maiamater', url: 'https://www.maiamater.camp' },
@@ -52,11 +54,11 @@ const AllContributors = ({ t }) => (
5254
</figure>
5355
</div>
5456
<div className="card-content">
55-
<p className="title is-4">
56-
{contributorName(contributor)}
57-
</p>
57+
<p className="title is-4">{contributorName(contributor)}</p>
5858
<p className="subtitle is-6">
59-
{t(`roles.${contributor.role}`, { context: contributor.i18nContext })}
59+
{t(`roles.${contributor.role}`, {
60+
context: contributor.i18nContext
61+
})}
6062
</p>
6163
</div>
6264
</div>
@@ -65,15 +67,19 @@ const AllContributors = ({ t }) => (
6567
)
6668

6769
function contributorName({ url, name }) {
68-
return url
69-
? <ExternalLinkNewTab href={url}>{name}</ExternalLinkNewTab>
70-
: name
70+
return url ? <ExternalLinkNewTab href={url}>{name}</ExternalLinkNewTab> : name
7171
}
7272

7373
function contributorPicture({ picture }) {
74-
return picture
75-
? <img src={`/assets/img/contributors/${picture}.jpg`} alt="" />
76-
: <img src="/assets/img/contributors/no-picture.svg" className="no-picture" alt="" />
74+
return picture ? (
75+
<img src={`/assets/img/contributors/${picture}.jpg`} alt="" />
76+
) : (
77+
<img
78+
src="/assets/img/contributors/no-picture.svg"
79+
className="no-picture"
80+
alt=""
81+
/>
82+
)
7783
}
7884

7985
export default withNamespaces('home')(AllContributors)

app/i18n/en/videoDebate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ export default {
6161
autoscroll_enable: 'Enable Autoscroll',
6262
autoscroll_disable: 'Disable Autoscroll',
6363
soundOnBackgroundFocus_enable:
64-
'Enable sound when the focus change in background',
64+
'Play a sound when the focus change in background',
6565
soundOnBackgroundFocus_disable:
66-
'Disable sound when the focus change in background',
66+
"Don't play a sound when the focus change in background",
6767
reverseTimeLock_lock: 'Unlock time marker',
6868
reverseTimeLock_unlock: 'Lock time marker'
6969
},
14.8 KB
Loading
12.4 KB
Loading

0 commit comments

Comments
 (0)