Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Local-only UI rework #907

Open
wants to merge 6 commits into
base: hometown-dev
Choose a base branch
from
Open

Local-only UI rework #907

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddbbd4e
merge local-only option into visibility dropdown
exstral May 3, 2021
07ddb50
show status visibility in feed including local_only
exstral May 3, 2021
416b16c
further changes to privacy dropdown texts
exstral May 14, 2021
c01d3a3
adjust implementation for visibility texts
vincentreynaud May 14, 2021
0f7f26e
add back privacy status unlisted and new local_private combination
exstral Jun 5, 2021
e03bc46
change status visibility icon for local_private and update texts
exstral Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjust implementation for visibility texts
  • Loading branch information
@vincentreynaud @exstral
vincentreynaud authored and exstral committed Jan 14, 2022
commit c01d3a3c5201e5b1f43a5ce426cdc8332cf3cb96
2 changes: 1 addition & 1 deletion app/javascript/mastodon/components/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ class Status extends ImmutablePureComponent {
'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
'local_only': { icon: 'users', text: intl.formatMessage(messages.local_only_short) },
'local_only': { icon: 'users', text: intl.formatMessage(messages.local_only_short, { instance: document.title }) },
};

let visibilityIcon = visibilityIconInfo[status.get('visibility')];
Expand Down
5 changes: 2 additions & 3 deletions app/javascript/mastodon/features/compose/components/privacy_dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,8 @@ class PrivacyDropdown extends React.PureComponent {

componentWillMount () {
const { intl: { formatMessage } } = this.props;
// TODO get the real instance name and domain here
const instance = 'Local';
const domain = 'this community';
const instance = document.title;
const domain = window.location.origin.replace(/^[a-z]+\:\/\//, "");

this.options = [
{ icon: 'users', value: 'local_only', text: formatMessage(messages.local_only_short, { instance }), meta: formatMessage(messages.local_only_long, { domain }) },
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/mastodon/features/status/components/detailed_status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class DetailedStatus extends ImmutablePureComponent {
'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
'local_only': { icon: 'users', text: intl.formatMessage(messages.local_only_short) },
'local_only': { icon: 'users', text: intl.formatMessage(messages.local_only_short, { instance: document.title }) },
};

let visibilityIcon = visibilityIconInfo[status.get('visibility')];
Expand Down