Skip to content

Commit

Permalink
Merge pull request #278 from CaptainFact/improvement/misc
Browse files Browse the repository at this point in the history
Minor improvements before release
  • Loading branch information
Betree authored Nov 23, 2018
2 parents ad2a971 + 6f22288 commit 158d8c6
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 15 deletions.
32 changes: 19 additions & 13 deletions app/components/Home/AllContributors.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,23 @@ import React from 'react'
import { withNamespaces } from 'react-i18next'
import ExternalLinkNewTab from '../Utils/ExternalLinkNewTab'


const ROLE_AMBASSADOR = 'ambassador'
const ROLE_AMBASSADOR_PADAWAN = 'ambassadorPadawan'
const ROLE_DEVELOPER = 'developer'
const ROLE_DONATOR = 'donator'
const ROLE_PARTNER = 'partner'

// prettier-ignore
const CONTRIBUTORS = [
{ role: ROLE_AMBASSADOR, name: 'Frédéric Bouffetier', picture: 'frederic' },
{ role: ROLE_AMBASSADOR, name: 'Timothée Roland', picture: 'timothee' },
{ role: ROLE_AMBASSADOR_PADAWAN, name: 'Dorian Cazottes', picture: 'dorian' },
{ role: ROLE_AMBASSADOR, name: 'Dorian Cazottes', picture: 'dorian' },
{ role: ROLE_PARTNER, name: 'ThinkerView', picture: 'thinkerview', url: 'https://thinkerview.com' },
{ role: ROLE_PARTNER, name: 'Heu?reka', picture: 'heureka', url: 'https://www.youtube.com/channel/UC7sXGI8p8PvKosLWagkK9wQ' },
{ role: ROLE_PARTNER, name: 'La Tronche en Biais', picture: 'troncheenbiais', url: 'https://www.youtube.com/user/TroncheEnBiais' },
{ role: ROLE_PARTNER, name: 'IMAGO', picture: 'imago', url: 'http://imagotv.fr/pdf/imago_presentation.pdf' },
{ role: ROLE_PARTNER, name: 'Système D', picture: 'systemed', url: 'https://www.systeme-d.co/' },
{ role: ROLE_PARTNER, name: 'Démocratie Ouverte', picture: 'democratie-ouverte', url: 'https://democratieouverte.org' },
{ role: ROLE_PARTNER, name: 'IMAGO', picture: 'imago', url: 'http://imagotv.fr' },
{ role: ROLE_PARTNER, name: 'TedX Nouméa', picture: 'tedxnoumea', url: 'https://tedxnoumea.com' },
{ role: ROLE_PARTNER, name: 'YesWeHack', picture: 'yeswehack', url: 'https://yeswehack.com' },
{ role: ROLE_PARTNER, name: 'Maia Mater', picture: 'maiamater', url: 'https://www.maiamater.camp' },
Expand Down Expand Up @@ -52,11 +54,11 @@ const AllContributors = ({ t }) => (
</figure>
</div>
<div className="card-content">
<p className="title is-4">
{contributorName(contributor)}
</p>
<p className="title is-4">{contributorName(contributor)}</p>
<p className="subtitle is-6">
{t(`roles.${contributor.role}`, { context: contributor.i18nContext })}
{t(`roles.${contributor.role}`, {
context: contributor.i18nContext
})}
</p>
</div>
</div>
Expand All @@ -65,15 +67,19 @@ const AllContributors = ({ t }) => (
)

function contributorName({ url, name }) {
return url
? <ExternalLinkNewTab href={url}>{name}</ExternalLinkNewTab>
: name
return url ? <ExternalLinkNewTab href={url}>{name}</ExternalLinkNewTab> : name
}

function contributorPicture({ picture }) {
return picture
? <img src={`/assets/img/contributors/${picture}.jpg`} alt="" />
: <img src="/assets/img/contributors/no-picture.svg" className="no-picture" alt="" />
return picture ? (
<img src={`/assets/img/contributors/${picture}.jpg`} alt="" />
) : (
<img
src="/assets/img/contributors/no-picture.svg"
className="no-picture"
alt=""
/>
)
}

export default withNamespaces('home')(AllContributors)
4 changes: 2 additions & 2 deletions app/i18n/en/videoDebate.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ export default {
autoscroll_enable: 'Enable Autoscroll',
autoscroll_disable: 'Disable Autoscroll',
soundOnBackgroundFocus_enable:
'Enable sound when the focus change in background',
'Play a sound when the focus change in background',
soundOnBackgroundFocus_disable:
'Disable sound when the focus change in background',
"Don't play a sound when the focus change in background",
reverseTimeLock_lock: 'Unlock time marker',
reverseTimeLock_unlock: 'Lock time marker'
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/static/assets/img/contributors/systemed.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 158d8c6

Please sign in to comment.