Skip to content

Commit

Permalink
Fix visibility string and description texts
Browse files Browse the repository at this point in the history
  • Loading branch information
@thomasgwatson
thomasgwatson committed May 12, 2023
1 parent dc20c32 commit fdb69cc
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 47 deletions.
2 changes: 1 addition & 1 deletion public/locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,6 @@
"wrote:": "wrote:",
"wrote: ": "wrote: ",
"you're subscribed to #{{topicName}}": "you're subscribed to #{{topicName}}",
"{group.name} is only accessible to members of the following groups:": "{group.name} is only accessible to members of the following groups:",
"{{action}} was canceled or no user data was found.": "{{action}} was canceled or no user data was found.",
"{{appName}} is asking to have offline access to Hylo": "{{appName}} is asking to have offline access to Hylo",
"{{appName}} is asking you to confirm previously given authorization": "{{appName}} is asking you to confirm previously given authorization",
Expand All @@ -936,6 +935,7 @@
"{{group.name}} is interested in increasing their sales": "{{group.name}} is interested in increasing their sales",
"{{group.name}} is interested in low-cost loans": "{{group.name}} is interested in low-cost loans",
"{{group.name}} is not a member of any groups yet": "{{group.name}} is not a member of any groups yet",
"{{group.name}} is only accessible to members of the following groups:": "{{group.name}} is only accessible to members of the following groups:",
"{{group.name}} is open to co-hosting events": "{{group.name}} is open to co-hosting events",
"{{group.name}} is seeking ecosystem services": "{{group.name}} is seeking ecosystem services",
"{{group.name}} is seeking farm support": "{{group.name}} is seeking farm support",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@
"wrote:": "escribió:",
"wrote: ": "escribió:",
"you're subscribed to #{{topicName}}": "estás suscrito",
"{group.name} is only accessible to members of the following groups:": "{group.name} solo es accesible para los miembros de los siguientes grupos:",
"{{group.name}} is only accessible to members of the following groups:": "{{group.name}} solo es accesible para los miembros de los siguientes grupos:",
"{{action}} was canceled or no user data was found.": "{{action}} se canceló o no se encontraron datos de usuario.",
"{{appName}} is asking to have offline access to Hylo": "{{appName}} solicita acceso sin conexión a Hylo",
"{{appName}} is asking you to confirm previously given authorization": "{{appName}} te pide que confirmes la autorización otorgada previamente",
Expand Down
11 changes: 6 additions & 5 deletions src/routes/GroupDetail/GroupDetail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,11 @@ class UnwrappedGroupDetail extends Component {
<h3>{t('Privacy settings')}</h3>
<div styleName='g.privacySetting'>
<Icon name={visibilityIcon(group.visibility)} styleName='g.settingIcon' />
<p>{visibilityString(group.visibility)} - {visibilityDescription(group.visibility)}</p>
<p>{t(visibilityString(group.visibility))} - {t(visibilityDescription(group.visibility))}</p>
</div>
<div styleName='g.privacySetting'>
<Icon name={accessibilityIcon(group.accessibility)} styleName='g.settingIcon' />
<p>{accessibilityString(group.accessibility)} - {accessibilityDescription(group.accessibility)}</p>
<p>{t(accessibilityString(group.accessibility))} - {t(accessibilityDescription(group.accessibility))}</p>
</div>
</div>
: ''
Expand Down Expand Up @@ -272,6 +272,7 @@ class UnwrappedGroupDetail extends Component {
requestToJoinGroup={this.requestToJoinGroup}
removeSkill={removeSkill}
routeParams={routeParams}
t={t}
/>
</div>
)
Expand Down Expand Up @@ -301,7 +302,7 @@ export function JoinSection ({ addSkill, currentUser, fullPage, group, groupsWit
}
{ group.prerequisiteGroups && group.prerequisiteGroups.length > 0
? <div styleName='g.prerequisiteGroups'>
{group.prerequisiteGroups.length === 1 ? <h4>{group.name}{' '}{t('is only accessible to members of')}{' '}{group.prerequisiteGroups.map(prereq => <span key={prereq.id}>{prereq.name}</span>)}</h4> : <h4>{t('{group.name} is only accessible to members of the following groups:', { group })}</h4>}
{group.prerequisiteGroups.length === 1 ? <h4>{group.name}{' '}{t('is only accessible to members of')}{' '}{group.prerequisiteGroups.map(prereq => <span key={prereq.id}>{prereq.name}</span>)}</h4> : <h4>{t('{{group.name}} is only accessible to members of the following groups:', { group })}</h4>}
{group.prerequisiteGroups.map(prereq => <div key={prereq.id} styleName='g.prerequisiteGroup'>
<Link to={fullPage ? groupUrl(prereq.slug) : groupDetailUrl(prereq.slug, routeParams)} styleName='g.groupDetailHeader g.prereqHeader' style={{ backgroundImage: `url(${prereq.bannerUrl || DEFAULT_BANNER})` }}>
<div styleName='g.groupTitleContainer'>
Expand All @@ -312,13 +313,13 @@ export function JoinSection ({ addSkill, currentUser, fullPage, group, groupsWit
<span styleName='g.group-privacy'>
<Icon name={visibilityIcon(prereq.visibility)} styleName='g.privacy-icon' />
<div styleName='g.privacy-tooltip'>
<div>{visibilityString(prereq.visibility)} - {visibilityDescription(prereq.visibility)}</div>
<div>{t(visibilityString(prereq.visibility))} - {t(visibilityDescription(prereq.visibility))}</div>
</div>
</span>
<span styleName='g.group-privacy'>
<Icon name={accessibilityIcon(prereq.accessibility)} styleName='g.privacy-icon' />
<div styleName='g.privacy-tooltip'>
<div>{accessibilityString(prereq.accessibility)} - {accessibilityDescription(prereq.accessibility)}</div>
<div>{t(accessibilityString(prereq.accessibility))} - {t(accessibilityDescription(prereq.accessibility))}</div>
</div>
</span>
{prereq.location}
Expand Down
7 changes: 4 additions & 3 deletions src/routes/GroupSettings/PrivacySettingsTab/PrivacySettingsTab.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ function AccessibilitySettingRow ({ askJoinQuestions, clearField, currentSetting
<input type='radio' name='accessibility' value={forSetting} onChange={updateSetting('accessibility')} checked={currentSetting === forSetting} />
<Icon name={accessibilityIcon(forSetting)} styleName='styles.settingIcon' />
<div styleName='styles.settingDescription'>
<h4>{accessibilityString(forSetting)}</h4>
<span styleName={cx('styles.privacy-option', { 'styles.disabled': currentSetting !== forSetting })}>{accessibilityDescription(forSetting)}</span>
<h4>{t(accessibilityString(forSetting))}</h4>
<span styleName={cx('styles.privacy-option', { 'styles.disabled': currentSetting !== forSetting })}>{t(accessibilityDescription(forSetting))}</span>
</div>
</label>
{forSetting === currentSetting && currentSetting === GROUP_ACCESSIBILITY.Restricted &&
Expand All @@ -235,7 +235,8 @@ function AccessibilitySettingRow ({ askJoinQuestions, clearField, currentSetting
<SwitchStyled
checked={askJoinQuestions}
onChange={() => updateSettingDirectly('settings.askJoinQuestions')(!askJoinQuestions)}
backgroundColor={askJoinQuestions ? '#0DC39F' : '#8B96A4'} />
backgroundColor={askJoinQuestions ? '#0DC39F' : '#8B96A4'}
/>
<span styleName='general.toggleDescription'>{t('Require people to answer questions when requesting to join this group')}</span>
<div styleName='general.onOff'>
<div styleName='general.off'>{t('OFF')}</div>
Expand Down
72 changes: 38 additions & 34 deletions src/routes/Groups/Groups.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,50 +88,54 @@ class Groups extends Component {
}

export function GroupsList ({ groups, routeParams }) {
return <div styleName='group-list'>
{groups.map(c => <GroupCard group={c} key={c.id} routeParams={routeParams} />)}
</div>
return (
<div styleName='group-list'>
{groups.map(c => <GroupCard group={c} key={c.id} routeParams={routeParams} />)}
</div>
)
}

export function GroupCard ({ group, routeParams }) {
const { t } = useTranslation()
return <Link to={group.memberStatus === 'member' ? groupUrl(group.slug) : groupDetailUrl(group.slug, routeParams)} styleName='group-link'>
<div styleName='group-card'>
<div styleName='card-wrapper'>
<RoundImage url={group.avatarUrl || DEFAULT_AVATAR} styleName='group-image' size='50px' square />
<div styleName='group-details'>
<span styleName='group-name'>{group.name}</span>
<div styleName='group-stats'>
{group.memberCount ? <span styleName='member-count'>{group.memberCount} {t('Members')}</span> : ' '}
<div styleName='membership-status'>
<div styleName='group-privacy'>
<Icon name={visibilityIcon(group.visibility)} styleName='privacy-icon' />
<div styleName='privacy-tooltip'>
<div><strong>{visibilityString(group.visibility)}</strong> - {visibilityDescription(group.visibility)}</div>
return (
<Link to={group.memberStatus === 'member' ? groupUrl(group.slug) : groupDetailUrl(group.slug, routeParams)} styleName='group-link'>
<div styleName='group-card'>
<div styleName='card-wrapper'>
<RoundImage url={group.avatarUrl || DEFAULT_AVATAR} styleName='group-image' size='50px' square />
<div styleName='group-details'>
<span styleName='group-name'>{group.name}</span>
<div styleName='group-stats'>
{group.memberCount ? <span styleName='member-count'>{group.memberCount} {t('Members')}</span> : ' '}
<div styleName='membership-status'>
<div styleName='group-privacy'>
<Icon name={visibilityIcon(group.visibility)} styleName='privacy-icon' />
<div styleName='privacy-tooltip'>
<div><strong>{t(visibilityString(group.visibility))}</strong> - {t(visibilityDescription(group.visibility))}</div>
</div>
</div>
</div>
<div styleName='group-privacy'>
<Icon name={accessibilityIcon(group.accessibility)} styleName='privacy-icon' />
<div styleName='privacy-tooltip'>
<div><strong>{accessibilityString(group.accessibility)}</strong> - {accessibilityDescription(group.accessibility)}</div>
<div styleName='group-privacy'>
<Icon name={accessibilityIcon(group.accessibility)} styleName='privacy-icon' />
<div styleName='privacy-tooltip'>
<div><strong>{t(accessibilityString(group.accessibility))}</strong> - {t(accessibilityDescription(group.accessibility))}</div>
</div>
</div>
{
group.memberStatus === 'member' ? <div styleName='status-tag'><Icon name='Complete' styleName='member-complete' /> <b>{t('Member')}</b></div>
: group.memberStatus === 'requested' ? <div styleName='status-tag'><b>{t('Membership Requested')}</b></div>
: <div styleName='status-tag'><Icon name='CirclePlus' styleName='join-group' /> <b>{t('Join')}</b></div>
}
</div>
{
group.memberStatus === 'member' ? <div styleName='status-tag'><Icon name='Complete' styleName='member-complete' /> <b>{t('Member')}</b></div>
: group.memberStatus === 'requested' ? <div styleName='status-tag'><b>{t('Membership Requested')}</b></div>
: <div styleName='status-tag'><Icon name='CirclePlus' styleName='join-group' /> <b>{t('Join')}</b></div>
}
</div>
</div>
<div styleName='group-description'>
<ClickCatcher>
<HyloHTML element='span' html={TextHelpers.markdown(group.description)} />
</ClickCatcher>
<div styleName='group-description'>
<ClickCatcher>
<HyloHTML element='span' html={TextHelpers.markdown(group.description)} />
</ClickCatcher>
</div>
</div>
</div>
<div style={bgImageStyle(group.bannerUrl || DEFAULT_BANNER)} styleName='groupCardBackground'><div /></div>
</div>
<div style={bgImageStyle(group.bannerUrl || DEFAULT_BANNER)} styleName='groupCardBackground'><div /></div>
</div>
</Link>
</Link>
)
}
export default withTranslation()(Groups)
6 changes: 3 additions & 3 deletions src/routes/MemberProfile/MemberProfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ class MemberProfile extends React.Component {
const isAxolotl = AXOLOTL_ID === personId
const contentDropDownItems = [
{ id: 'Overview', label: t('Overview'), title: t('{{name}}s recent activity', { name: person.name }), component: RecentActivity },
{ id: 'Posts', label: t('Posts'), title: t('{{name}}s posts', { person }), component: MemberPosts },
{ id: 'Comments', label: t('Comments'), title: t('{{name}}s comments', { person }), component: MemberComments },
{ id: 'Reactions', label: t('Reactions'), title: t('{{name}}s reactions', { person }), component: MemberVotes }
{ id: 'Posts', label: t('Posts'), title: t('{{name}}s posts', { name: person.name }), component: MemberPosts },
{ id: 'Comments', label: t('Comments'), title: t('{{name}}s comments', { name: person.name }), component: MemberComments },
{ id: 'Reactions', label: t('Reactions'), title: t('{{name}}s reactions', { name: person.name }), component: MemberVotes }
].map(contentDropDownitem => ({
...contentDropDownitem, onClick: () => this.selectTab(contentDropDownitem.label)
}))
Expand Down

0 comments on commit fdb69cc

Please sign in to comment.