Commit cbd77f7e authored by Eugen Rochko's avatar Eugen Rochko

Merge branch 'humor' into 'master'

add humor category

See merge request mastodon/joinmastodon!17
parents 525622b1 768a5ffa
...@@ -29,6 +29,7 @@ const categories = [ ...@@ -29,6 +29,7 @@ const categories = [
'tech', 'tech',
'academia', 'academia',
'adult', 'adult',
'humor'
]; ];
const languages = [ const languages = [
......
...@@ -21,6 +21,7 @@ const messages = defineMessages({ ...@@ -21,6 +21,7 @@ const messages = defineMessages({
adult_content_creator: { id: 'wizard.filter.adult_content_creator', defaultMessage: 'an adult content creator' }, adult_content_creator: { id: 'wizard.filter.adult_content_creator', defaultMessage: 'an adult content creator' },
lgbt: { id: 'wizard.filter.lgbt', defaultMessage: 'LGBTQ+' }, lgbt: { id: 'wizard.filter.lgbt', defaultMessage: 'LGBTQ+' },
poc_aa: { id: 'wizard.filter.poc_aa', defaultMessage: 'Black American' }, poc_aa: { id: 'wizard.filter.poc_aa', defaultMessage: 'Black American' },
humor: { id: 'wizard.filter.humor', defaultMessage: 'a humorist' },
}); });
const caretIcon = ( const caretIcon = (
...@@ -92,6 +93,7 @@ class Wizard extends React.PureComponent { ...@@ -92,6 +93,7 @@ class Wizard extends React.PureComponent {
{ value: 'tech-1', text: intl.formatMessage(messages.sysadmin) }, { value: 'tech-1', text: intl.formatMessage(messages.sysadmin) },
{ value: 'academia', text: intl.formatMessage(messages.academia) }, { value: 'academia', text: intl.formatMessage(messages.academia) },
{ value: 'adult', text: intl.formatMessage(messages.adult_content_creator) }, { value: 'adult', text: intl.formatMessage(messages.adult_content_creator) },
{ value: 'humor', text: intl.formatMessage(messages.humor) },
]} ]}
caretIcon={caretIcon} caretIcon={caretIcon}
selectedValue={category} selectedValue={category}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment